From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1482027-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2865415800F
for <garchives@archives.gentoo.org>; Sun, 29 Jan 2023 14:36:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A26CE0843;
Sun, 29 Jan 2023 14:36:10 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 384C8E0843
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 14:36:10 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0106E335C07
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 14:36:09 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 347F7889
for <gentoo-commits@lists.gentoo.org>; Sun, 29 Jan 2023 14:36:07 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1675002952.26b6ff712cb15a22b9c3bafe4ad273912d02d045.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/lld/lld-15.0.7.ebuild sys-devel/lld/lld-16.0.0.9999.ebuild sys-devel/lld/lld-16.0.0_pre20230107.ebuild sys-devel/lld/lld-16.0.0_pre20230127.ebuild sys-devel/lld/lld-17.0.0.9999.ebuild
X-VCS-Directories: sys-devel/lld/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: 26b6ff712cb15a22b9c3bafe4ad273912d02d045
X-VCS-Branch: master
Date: Sun, 29 Jan 2023 14:36:07 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: f92feaf8-a56a-4ed0-9ab9-a67ef62b4455
X-Archives-Hash: 5e2b66eda006fe680bc92c0980c36194
commit: 26b6ff712cb15a22b9c3bafe4ad273912d02d045
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 14:35:52 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 14:35:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b6ff71
sys-devel/lld: Simplify cross-compile with BDEPEND
I was so used to fixing LLVM and Clang with has_version, due to the dependency
being circular, that I forgot that I could just use BDEPEND in this case.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
sys-devel/lld/lld-15.0.7.ebuild | 11 ++++-------
sys-devel/lld/lld-16.0.0.9999.ebuild | 11 ++++-------
sys-devel/lld/lld-16.0.0_pre20230107.ebuild | 11 ++++-------
sys-devel/lld/lld-16.0.0_pre20230127.ebuild | 11 ++++-------
sys-devel/lld/lld-17.0.0.9999.ebuild | 11 ++++-------
5 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/sys-devel/lld/lld-15.0.7.ebuild b/sys-devel/lld/lld-15.0.7.ebuild
index 6156f9bae682..9f1faebcbbbf 100644
--- a/sys-devel/lld/lld-15.0.7.ebuild
+++ b/sys-devel/lld/lld-15.0.7.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
!sys-devel/lld:0
"
BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -77,13 +78,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
- if tc-is-cross-compiler; then
- has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
- die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
- mycmakeargs+=(
- -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
- )
- fi
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
cmake_src_configure
}
diff --git a/sys-devel/lld/lld-16.0.0.9999.ebuild b/sys-devel/lld/lld-16.0.0.9999.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-16.0.0.9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
!sys-devel/lld:0
"
BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
- if tc-is-cross-compiler; then
- has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
- die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
- mycmakeargs+=(
- -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
- )
- fi
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
cmake_src_configure
}
diff --git a/sys-devel/lld/lld-16.0.0_pre20230107.ebuild b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20230107.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
!sys-devel/lld:0
"
BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
- if tc-is-cross-compiler; then
- has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
- die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
- mycmakeargs+=(
- -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
- )
- fi
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
cmake_src_configure
}
diff --git a/sys-devel/lld/lld-16.0.0_pre20230127.ebuild b/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
+++ b/sys-devel/lld/lld-16.0.0_pre20230127.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
!sys-devel/lld:0
"
BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
- if tc-is-cross-compiler; then
- has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
- die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
- mycmakeargs+=(
- -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
- )
- fi
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
cmake_src_configure
}
diff --git a/sys-devel/lld/lld-17.0.0.9999.ebuild b/sys-devel/lld/lld-17.0.0.9999.ebuild
index c23949899ce7..d22c1fb13951 100644
--- a/sys-devel/lld/lld-17.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-17.0.0.9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
!sys-devel/lld:0
"
BDEPEND="
+ sys-devel/llvm:${LLVM_MAJOR}
test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
@@ -76,13 +77,9 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
- if tc-is-cross-compiler; then
- has_version -b sys-devel/llvm:${LLVM_MAJOR} ||
- die "sys-devel/llvm:${LLVM_MAJOR} is required on the build host."
- mycmakeargs+=(
- -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
- )
- fi
+ tc-is-cross-compiler && mycmakeargs+=(
+ -DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
+ )
cmake_src_configure
}