commit: 3cd6d3273c98da84571084ce2e814c2bbb2d6bb3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 3 18:06:10 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 3 18:09:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd6d327
sys-libs/compiler-rt-sanitizers: Add ABI_X86 flags
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../compiler-rt-sanitizers-13.0.1.9999.ebuild | 14 ++++++++++++--
.../compiler-rt-sanitizers-13.0.1_rc1.ebuild | 14 ++++++++++++--
.../compiler-rt-sanitizers-14.0.0.9999.ebuild | 14 ++++++++++++--
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
index 80c9d7d0f6b4..14e8ad24e742 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \
+ python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
- virtual/libcrypt"
+ virtual/libcrypt[${MULTILIB_USEDEP}]"
BDEPEND="
>=dev-util/cmake-3.16
clang? ( sys-devel/clang )
@@ -137,6 +139,14 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use test; then
mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
index 8c47c346f451..9c861d2942be 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \
+ python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
- virtual/libcrypt"
+ virtual/libcrypt[${MULTILIB_USEDEP}]"
BDEPEND="
>=dev-util/cmake-3.16
clang? ( sys-devel/clang )
@@ -137,6 +139,14 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use test; then
mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
diff --git
a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
index 97edc3f19193..bfbb1896914d 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild
@@ -3,8 +3,10 @@
EAPI=7
+MULTILIB_COMPAT=( abi_x86_{32,64} )
PYTHON_COMPAT=( python3_{8..10} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \
+ python-any-r1
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
HOMEPAGE="https://llvm.org/";
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
- virtual/libcrypt"
+ virtual/libcrypt[${MULTILIB_USEDEP}]"
BDEPEND="
>=dev-util/cmake-3.16
clang? ( sys-devel/clang )
@@ -137,6 +139,14 @@ src_configure() {
-DPython3_EXECUTABLE="${PYTHON}"
)
+
+ if use amd64; then
+ mycmakeargs+=(
+ -DCAN_TARGET_i386=$(usex abi_x86_32)
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64)
+ )
+ fi
+
if use test; then
mycmakeargs+=(
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
