Date: Fri, 27 Aug 2021 16:14:01 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 150110612df6 - main - devel/llvm13: assorted build/plist fixes Message-ID: <202108271614.17RGE1L4042601@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=150110612df671da9ae395e8b92f05f1c11716bc commit 150110612df671da9ae395e8b92f05f1c11716bc Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2021-08-27 16:13:32 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2021-08-27 16:13:32 +0000 devel/llvm13: assorted build/plist fixes Disable compiler-rt on FreeBSD 11 as it doesn't compile with current patches. Correct plist issues preventing packaging in certain situations. PR: 258062 Sponsored by: DARPA --- devel/llvm13/Makefile | 5 ++++- devel/llvm13/pkg-plist | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 1c9df0ab23de..a4e283df65a1 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -99,6 +99,7 @@ OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP OPTIONS_DEFAULT_powerpc64_13= GOLD OPTIONS_DEFAULT_powerpc64_14= GOLD OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP +OPTIONS_EXCLUDE_FreeBSD_11= COMPILER_RT OPTIONS_EXCLUDE_i386= FLANG OPTIONS_EXCLUDE_powerpc= FLANG OPTIONS_DEFAULT_riscv64= OPENMP @@ -391,7 +392,7 @@ _BE_LIBS_PowerPC= AsmParser Disassembler _BE_LIBS_RISCV= AsmParser Disassembler _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler -_BE_LIBS_WebAssembly= AsmParser Disassembler +_BE_LIBS_WebAssembly= AsmParser Disassembler Utils _BE_LIBS_X86= AsmParser Disassembler _BE_LIBS_XCore= Disassembler .for BE in FREEBSD NATIVE STANDARD @@ -444,6 +445,7 @@ _COMPILER_RT_LIBS= \ libclang_rt.msan-x86_64.a.syms \ libclang_rt.msan_cxx-x86_64.a \ libclang_rt.msan_cxx-x86_64.a.syms \ + libclang_rt.orc-x86_64.a \ libclang_rt.profile-x86_64.a \ libclang_rt.safestack-x86_64.a \ libclang_rt.stats-x86_64.a \ @@ -598,6 +600,7 @@ do-test: fi build-plist: + @[ -d ${STAGEDIR} ] || (echo "Can't make plist before package is staged ${STAGEDIR}" && exit 1) ${RM} ${PLIST} ${PLIST}.tmp ${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp ${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist index 744d8decbaef..20134f6b85e0 100644 --- a/devel/llvm13/pkg-plist +++ b/devel/llvm13/pkg-plist @@ -4559,7 +4559,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMTarget.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTextAPI.a llvm%%LLVM_SUFFIX%%/lib/libLLVMTransformUtils.a llvm%%LLVM_SUFFIX%%/lib/libLLVMVectorize.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMWebAssemblyUtils.a llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108271614.17RGE1L4042601>