git: 51986cc1d33a - 2024Q2 - devel/llvm-devel: fix build on non-amd64 / non-14.0

The branch 2024Q2 has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=51986cc1d33a09ed8add8d3b0f8ca28facd045c1

commit 51986cc1d33a09ed8add8d3b0f8ca28facd045c1
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-04-16 21:45:33 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-04-23 22:14:13 +0000

    devel/llvm-devel: fix build on non-amd64 / non-14.0
    
    (cherry picked from commit c8f7adea62571d6e3d9ae5a0c55fac16bda58169)
---
 devel/llvm-devel/Makefile  |  4 +++-
 devel/llvm-devel/pkg-plist | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index c5ab4ea63af3..17e4a026db8f 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -179,7 +179,8 @@ STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers)
 
 CONFLICTS_INSTALL=	${PORTNAME}${LLVM_SUFFIX} ${PORTNAME}${LLVM_SUFFIX}-lite
 
-PLIST_SUB+=	LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR} \
+PLIST_SUB+=	CONFIGURE_TARGET=${CONFIGURE_TARGET} \
+		LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE}
 
@@ -502,6 +503,7 @@ build-plist:
 	    -e 's|${LLVM_MAJOR}git|%%LLVM_MAJOR%%git|' \
 	    -e 's|/${LLVM_MAJOR}/|/%%LLVM_MAJOR%%/|' \
 	    -e 's|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \
+	    -e 's|${CONFIGURE_TARGET}|%%CONFIGURE_TARGET%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${LIT_MOD_NAME} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index acd7e07fb758..aee28c5d7bbf 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -6027,6 +6027,14 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%POLLY%%llvm-devel/include/polly/isl/vec.h
 %%POLLY%%llvm-devel/include/polly/isl/version.h
 %%POLLY%%llvm-devel/include/polly/isl/vertices.h
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/cmake/openmp/FindOpenMPTarget.cmake
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libarcher.so
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libarcher_static.a
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libgomp.so
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libiomp5.so
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libomp.so
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libomptarget.so
+%%OPENMP%%llvm-devel/lib/%%CONFIGURE_TARGET%%/libomptarget.so.%%LLVM_MAJOR_MINOR%%git
 %%POLLY%%llvm-devel/lib/LLVMPolly.so
 %%CLANG%%%%FLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ISO_Fortran_binding.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_builtin_vars.h
@@ -7078,14 +7086,6 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR_MINOR%%git
 %%MLIR%%llvm-devel/lib/objects-Release/obj.MLIRCAPITransformDialectTransforms/TransformInterpreter.cpp.o
 %%MLIR%%llvm-devel/lib/objects-Release/obj.MLIRCAPITransforms/Passes.cpp.o
 %%MLIR%%llvm-devel/lib/objects-Release/obj.MLIRCAPIVector/Vector.cpp.o
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/cmake/openmp/FindOpenMPTarget.cmake
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libarcher.so
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libarcher_static.a
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libgomp.so
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libiomp5.so
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libomp.so
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libomptarget.so
-%%OPENMP%%llvm-devel/lib/x86_64-portbld-freebsd14.0/libomptarget.so.%%LLVM_MAJOR_MINOR%%git
 %%CLANG%%llvm-devel/libexec/analyze-c++
 %%CLANG%%llvm-devel/libexec/analyze-cc
 %%CLANG%%llvm-devel/libexec/c++-analyzer