From nobody Tue Apr 23 22:14:33 2024 X-Original-To: dev-commits-ports-branches@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 4VPGcn6cZgz5JBN7; Tue, 23 Apr 2024 22:14:33 +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 4VPGcn64wsz522Z; Tue, 23 Apr 2024 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713910473; 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=u+rwKFPSyK2P7DYMg12UbRyoalywYkrHbbv4OGp9/vc=; b=x1NAKvXdkKhO1EbJP97aWze/Lb4w2kh443lD7OMYDhsMkiQT4Mh9NcMNMeFutmhAWxJNXm XUTN1j+xz/6Zcuo6lTGisT3+vTxLoDfWR5YkQ9Y3CaRDXbeTTtdUyPIJAiLj3i6N6kprBk EfmieAfkwVk7eAeDEtw1qDKTp7UyZG4NBc+BN/9+veS1XAsGuCgO0ffPu0N0NEFVn3x0gg 1F9p84ACFpn3+RW/+HlcapD40ZmIo1Dj8UoXReHfHqYbqwjvUunyMb7rWXATjkLl8NKj3O ZOlfk6K174rq7RyBfDcnpKyl19MQhk9uEjODD65o+XENBZfHC/2ZqCj5QB3ORA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713910473; a=rsa-sha256; cv=none; b=cYG1qB4X6mVL33Cl5THGT6ImPtJQJ+NE7r7qEc2oHSNAigZpA84Vwr8Mj8ukYpi0gIhHlP F7Xr9UfKQF+moU5bqMJwrqgJy+E4L5QB7CD4bOPmdzJG4t3gjb7mo2PfUbftgycwzeQX/l a+VGcGcmelas58pQ0zCHpF/xI5K3Seu+6YrgStPaDILcYgmaVYUSWoJ9KokEOA4OvhqI2l pbWQj2ZWi5L4M5N9/ZcJLbcRlIRsM5XP6FX0pVhIosidXhWEDNxm0obmmeO71i4li5UMM/ iA/y4KBLGIWzMykQrseRrEyFU5BnGQTYBAUywQVUpifbZLC1axCyJ3LPo7p+ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713910473; 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=u+rwKFPSyK2P7DYMg12UbRyoalywYkrHbbv4OGp9/vc=; b=dNKotHH+2y0VKnfYPTSfPXXIEb5VVIUQIN9MFGq8VsKK8rR7UYnLDSVFPTqTme0vhFTe4o 9z0sEi3gsjwC2caGiwbLcuLD4X8kQCNb4sRUJQM+apXkqjFOWn6neQTGmuwjbr1cJpgZPC 6kNnAuMVRr2L0q7BEoMDGLiIN4g/VdgCQN1D2vugy8trAZgTYGkheMEII+t82KvuJFRSiy MPfk1yP9rvrLLYx0LhOszt0m0CLZq7JSu5UFYiQ5x3GPT9J7D4eqteIwV7Tjmr6Z0Q1wcR 9prxmsOyjpGS/0110XdVj1HebTwT8JYVeSBzdOLIBefPgTY7R/zgztBThfw1Bw== 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 4VPGcn5h4NzpbS; Tue, 23 Apr 2024 22:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NMEXhk031898; Tue, 23 Apr 2024 22:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NMEXtJ031895; Tue, 23 Apr 2024 22:14:33 GMT (envelope-from git) Date: Tue, 23 Apr 2024 22:14:33 GMT Message-Id: <202404232214.43NMEXtJ031895@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: 51986cc1d33a - 2024Q2 - devel/llvm-devel: fix build on non-amd64 / non-14.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 51986cc1d33a09ed8add8d3b0f8ca28facd045c1 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=51986cc1d33a09ed8add8d3b0f8ca28facd045c1 commit 51986cc1d33a09ed8add8d3b0f8ca28facd045c1 Author: Piotr Kubaj AuthorDate: 2024-04-16 21:45:33 +0000 Commit: Brooks Davis 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