Date: Tue, 5 Oct 2021 18:55:26 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 31aaf91a386e - 2021Q4 - devel/llvm13: fix BE_NATIVE build Message-ID: <202110051855.195ItQ5F048242@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=31aaf91a386e85ec001ea334e80ce1dc32961142 commit 31aaf91a386e85ec001ea334e80ce1dc32961142 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2021-10-05 18:53:10 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2021-10-05 18:55:05 +0000 devel/llvm13: fix BE_NATIVE build Handle new per-backend Exegesis libraries. Awkwardly, they use the opposite convention of all other per-arch binaries so add (hopefuly temporary) machinery to support libLLVM<Foo><Arch>.a libraries. PR: 258897 Sponsored by: DARPA (cherry picked from commit 1fca16446ff2ff675ee3cfd6284fa46016a7d498) --- devel/llvm13/Makefile | 7 ++++++- devel/llvm13/pkg-plist | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index 07e89a8d3960..5466df4b45f8 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -380,6 +380,7 @@ STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \ MSP430 NVPTX SystemZ WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils +_BE_LIBS_BACKWARDS_AArch64=Exegesis _BE_LIBS_AMDGPU= AsmParser Disassembler Utils _BE_LIBS_ARM= AsmParser Disassembler Utils _BE_LIBS_AVR= AsmParser Disassembler @@ -388,17 +389,21 @@ _BE_LIBS_Hexagon= AsmParser Disassembler _BE_LIBS_Lanai= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler _BE_LIBS_Mips= AsmParser Disassembler +_BE_LIBS_BACKWARDS_Mips=Exegesis _BE_LIBS_PowerPC= AsmParser Disassembler +_BE_LIBS_BACKWARDS_PowerPC=Exegesis _BE_LIBS_RISCV= AsmParser Disassembler _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler _BE_LIBS_WebAssembly= AsmParser Disassembler Utils _BE_LIBS_X86= AsmParser Disassembler +_BE_LIBS_BACKWARDS_X86=Exegesis _BE_LIBS_XCore= Disassembler .for BE in FREEBSD NATIVE STANDARD .for BE_ARCH in ${${BE}_BACKENDS} _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ - ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} + ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} \ + ${_BE_LIBS_BACKWARDS_${BE_ARCH}:S/$/${BE_ARCH}/} .endfor .endfor BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist index 292d61bb7b76..0d7e2d4de949 100644 --- a/devel/llvm13/pkg-plist +++ b/devel/llvm13/pkg-plist @@ -4682,10 +4682,6 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesis.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisAArch64.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisMips.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisPowerPC.a -llvm%%LLVM_SUFFIX%%/lib/libLLVMExegesisX86.a llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFileCheck.a llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenACC.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110051855.195ItQ5F048242>