From nobody Tue Apr 16 21:48:30 2024
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 4VJyMy4ykQz5H912;
Tue, 16 Apr 2024 21:48:30 +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 4VJyMy1mvpz4dCb;
Tue, 16 Apr 2024 21:48:30 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1713304110;
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=SrtwZx34vkA86mNw8CQNq/W9UhVLnj8yHN/yK1Df+84=;
b=TQeUtqsEcssdi8NT286J25Gfv+NHYNBZiMuxBk5O8kzYSDu3qJF4Z3ZR/DvznMcKqNNWL+
m3x9HeUIC0U8vUqQi8QYRmOeQqIX12GiYZZRk//WVzeH6O+DtJEOWHsbcXn4bHcyYrrsUN
u8fuhhwukJ6eEBT3qW2cJN4H5SzPnchxya4/ED34kgHRo28/FJQ8x8P2rsLS39k+rYA+RD
UhYg9Rt7cFl6pCxMS7JJI8+GgU4nzDw+2LnWqR7Vjim6HLzVySzHuv7WkKFWrc5abP3wpj
BfK+isjN7Tx623/gI+QORr8oAF6mYZke3rXhbhBoUCt3uv6L/PJzC3VqJcgI7A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713304110; a=rsa-sha256; cv=none;
b=YnGXdYQRVKv+WDSzWt347ruF9+zDItwpPcjlH4aZuwX9SMlyu3MgHqYhgKefnZBYiC8zp6
oJ4HB21oh452YKr1gcq0tl7RjUJXf85dWX32KkChahM5yoTF5wuWTTZ0hMViTrTVzHXzQO
4++QzF8hF4R5nP62YeHuBfWz5Hi51vO+MxR5+xDflG5m0ioBkuwynFHiCdmab75NytSUAv
bH9inG2g25tbpw5RN2lA75jEqIME3Vw2lVLTjvftSH8s4iFHksT7BG2S2WbzxZ4ODpNDRn
BZmqlV53qqLIIU3kh3Cw5LomxQ+kr4CDMio9ZxY339EX6Wnf3KMvgKWT7+OQnQ==
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=1713304110;
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=SrtwZx34vkA86mNw8CQNq/W9UhVLnj8yHN/yK1Df+84=;
b=giKm6/PQziBQu1HFJRgNOvfsa7CubxeS77ioKtyt0u47NL3fbAkbgvcscCyr6hCEiyKGql
UWmjGQOJLBf88Rkf7mTra3GgXCAi1XOaSSXONlHy5K2ZjRPXIHv9dc2t+9QvpyDgIwU2NZ
54aEHqH7mJl/MHZBOgkKyVYCToV+vgsCdVPz5fE27uAlnwkcjwFrq+F+ZYPyYqmJ8255aA
dbb8JuMBbKJgeu1Wy0D4OJ94WzriRi9xakyIhabnzc6zViN+kQHho9abgfz4bbdr0Hn7qC
IWHjvqwVPvwLfnjNWqWZl+AAan1bRrUT30acLMPQMisskXoNcmVXEnZxMkFLHQ==
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 4VJyMy1P63z10ZG;
Tue, 16 Apr 2024 21:48:30 +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 43GLmUX5096048;
Tue, 16 Apr 2024 21:48:30 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLmUNQ096045;
Tue, 16 Apr 2024 21:48:30 GMT
(envelope-from git)
Date: Tue, 16 Apr 2024 21:48:30 GMT
Message-Id: <202404162148.43GLmUNQ096045@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Subject: git: c8f7adea6257 - main - devel/llvm-devel: fix build on
non-amd64 / non-14.0
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: pkubaj
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: c8f7adea62571d6e3d9ae5a0c55fac16bda58169
Auto-Submitted: auto-generated
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c8f7adea62571d6e3d9ae5a0c55fac16bda58169
commit c8f7adea62571d6e3d9ae5a0c55fac16bda58169
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-04-16 21:45:33 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-04-16 21:48:17 +0000
devel/llvm-devel: fix build on non-amd64 / non-14.0
---
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