From nobody Tue Apr 18 19:30:06 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q1DXH6fzQz45Ync; Tue, 18 Apr 2023 19:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1DXH2mPFz4XV1; Tue, 18 Apr 2023 19:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681846207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYXT2RZBcKhQjT4+lS4f9Dn8jGL1+8kWMorYf27dy0o=; b=s4ta3nfzjtL0+AYaSb4suVHBjy3xLkUi+U+ANqRmcaRpDJcJmi1oP6IcJOu20lW2P1jueB zD125FBeOTvdetU3C9A9fMfyrl3RLLDRlpfrajEnSl9x8fAXwRo9HWihHGWGLJ7+oXDbTI cJkwdKACcEFfLptfo63BbLVzOA1RFriT300Tqb79SMhzHfpAVqJ2gObZEM/DeYBf3Kb1ql eWZyRKAEnBjyEL0tyARRfPygejYEAwWtu6gfnRxgKP/uYdEiDJlx0eIxMLGG0J9Y8X8yq3 BAAUfdKavLQIuEKmRj4OcfdfpOtx/6fXG/QCktZN5wBzcIjIXTzKCju8CNXbIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681846207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YYXT2RZBcKhQjT4+lS4f9Dn8jGL1+8kWMorYf27dy0o=; b=srTVSVnCFD9IZEn7taBWX2ro5lAs4RiOfVUZWhaOH8tXrT0kuN+hzfDJChtgcE9SceDeYv eGL0cYhwx+MoYWyuQf9Cia67NPfNlXkr40ADQOd94tmpLB6r54OJuoxY0AnOrYJe9Q82kh IPqah8kOBAri1yKJnQP+/UswsP0mkcdL+jGyChqyuDZmZe5sC2Vld9kvd94w10E6l+LLsi NJjXyIBOJgFylseGK8LoLah/lKkq/+DAgK1NG5FUqT7cAWuKtT2oYAvFrIam/xm9biN3T1 OF+95KPVEznpKHLO5YgFtBMkV82ZjC94jOuDCQo2je+vbVDrRbK3H8N7HlFt5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681846207; a=rsa-sha256; cv=none; b=M0mQLZoZCU9J2NvTWxam3I969/ycWAaZ7aGFM0e8zAPMnRwZxlSMAqZPtdCxkrNHeXoPXt /GP0wzp+MHukxYk8kTI0z7Gkl/wEBUbFvByeD3OuTvE/tMR/nB5vITJgRoF6lv/6trXrUN FqWdBxJ8wbbYflaphjk3aUoPXoU4m8XfcN7mzBW9SO7xbk6s5hsA6cztzY4xyBCiVmN+cn POBjEcmlZSvmGgs0Kr/ZgaA3ER0pS3cfvonscokY3k9/88zknrwD2T0MZrJCFEbmmwI8yh RIKRJJ4lioCPxt7LXfZwH6KS5T/k1v1akz3J9BUMo59E1sAAnS6i2Lwff90WXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q1DXG75XVzPlL; Tue, 18 Apr 2023 19:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33IJU6Im016717; Tue, 18 Apr 2023 19:30:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IJU6fr016714; Tue, 18 Apr 2023 19:30:06 GMT (envelope-from git) Date: Tue, 18 Apr 2023 19:30:06 GMT Message-Id: <202304181930.33IJU6fr016714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: f8c110106e2d - 2023Q2 - devel/llvm15: add a lite FLAVOR List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: f8c110106e2d0be76c46327d56f5b51643479634 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8c110106e2d0be76c46327d56f5b51643479634 commit f8c110106e2d0be76c46327d56f5b51643479634 Author: Brooks Davis AuthorDate: 2023-04-18 19:29:56 +0000 Commit: Brooks Davis CommitDate: 2023-04-18 19:29:56 +0000 devel/llvm15: add a lite FLAVOR The lite flavor is for when you just need a FreeBSD compiler (e.g., in CI). By default it includes CLANG and LLD as well as backends required for FreeBSD and FreeBSD ports (BE_NATIVE, BE_AMDGPU, and BE_WASM). The lite install is ~350GiB on amd64 vs ~1.7GiB for default and it has only a single dependency (zstandard). (The goal was no dependencies, but libzstd is a private lib in base.) Bump PORT_REVISION due to removal of clang libxml2 dependency. Sponsored by: DARPA (cherry picked from commit af979dd126ff49eabb75e48087ee284e288da322) --- devel/llvm15/Makefile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 166758c601e8..86dce0ee1d8a 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 15.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ @@ -22,6 +22,10 @@ LICENSE:= ${LICENSE:NARM} LIB_DEPENDS= libzstd.so:archivers/zstd +FLAVORS= default lite +FLAVOR?= ${FLAVORS:[1]} +lite_PKGNAMESUFFIX= ${LLVM_SUFFIX}-lite + LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} LLVM_SUFFIX= ${LLVM_MAJOR} @@ -75,6 +79,7 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF +CMAKE_ARGS+= -DLLVM_ENABLE_LIBXML2=OFF CMAKE_ARGS+= -DLLVM_ENABLE_LIBEDIT=OFF CMAKE_ARGS+= -DPython3_EXECUTABLE=${PYTHON_CMD} # LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.* @@ -85,7 +90,16 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU BE_WASM CLANG DOCS EXTRAS FLANG LIT LLD LLDB MLIR PYCLANG STATIC_LIBS +OPTIONS_DEFINE= BE_AMDGPU BE_WASM CLANG DOCS LLD STATIC_LIBS +OPTIONS_DEFAULT= BE_AMDGPU BE_WASM CLANG LLD +OPTIONS_SINGLE= BACKENDS +OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD +OPTIONS_SUB= yes + +.if ${FLAVOR:Mlite} +OPTIONS_DEFAULT+= BE_NATIVE +.else +OPTIONS_DEFINE+= EXTRAS FLANG LIT LLDB MLIR OPENMP PYCLANG OPTIONS_DEFINE_aarch64= OPENMP OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_i386= COMPILER_RT OPENMP @@ -93,7 +107,8 @@ OPTIONS_DEFINE_powerpc= COMPILER_RT GOLD OPTIONS_DEFINE_powerpc64= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_powerpc64le= COMPILER_RT GOLD OPENMP OPTIONS_DEFINE_riscv64= COMPILER_RT OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS LIT LLD LLDB PYCLANG STATIC_LIBS + +OPTIONS_DEFAULT+= BE_STANDARD EXTRAS LIT LLDB PYCLANG STATIC_LIBS OPTIONS_DEFAULT_aarch64= OPENMP OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT @@ -101,14 +116,13 @@ OPTIONS_DEFAULT_powerpc= COMPILER_RT GOLD OPTIONS_DEFAULT_powerpc64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_powerpc64le= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_riscv64= COMPILER_RT OPENMP + OPTIONS_EXCLUDE_armv6= FLANG OPTIONS_EXCLUDE_armv7= FLANG OPTIONS_EXCLUDE_i386= FLANG OPTIONS_EXCLUDE_powerpc= FLANG OPTIONS_EXCLUDE_riscv64= LLDB -OPTIONS_SINGLE= BACKENDS -OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD -OPTIONS_SUB= yes +.endif # All non-backend options _ALL_OPTIONS= CLANG COMPILER_RT DOCS EXTRAS FLANG GOLD LIT LLD LLDB MLIR OPENMP PYCLANG STATIC_LIBS @@ -133,7 +147,10 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ XCPP=clang-cpp${LLVM_SUFFIX} \ XLD=ld.lld${LLVM_SUFFIX} \ X_COMPILER_TYPE=clang -CLANG_USE= GNOME=libxml2 +.if ${FLAVOR:Mlite} +# scan-build does require perl, but lite users can install it manually. +CLANG_USE= PERL5=build +.endif COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ @@ -183,6 +200,8 @@ PYCLANG_VARS= _USES_PYTHON=python:3.6+ PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER} STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) +CONFLICTS_INSTALL= ${PORTNAME}${LLVM_SUFFIX} ${PORTNAME}${LLVM_SUFFIX}-lite + .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP=