| 1 |
commit: 1b8078187d4d85e5f5a88f80b665051939dd48a3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 4 13:24:29 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 4 13:25:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b807818 |
| 7 |
|
| 8 |
sys-libs/compiler-rt-sanitizers: Inline ABI_X86 flags to fix non-x86 |
| 9 |
|
| 10 |
Inline ABI_X86 flags instead of using multilib-build, as the latter |
| 11 |
injects a REQUIRED_USE constraint that is impossible to satisfy |
| 12 |
on non-x86 architectures. |
| 13 |
|
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
.../compiler-rt-sanitizers-13.0.1.9999.ebuild | 8 +++----- |
| 17 |
.../compiler-rt-sanitizers-13.0.1_rc1.ebuild | 8 +++----- |
| 18 |
.../compiler-rt-sanitizers-14.0.0.9999.ebuild | 8 +++----- |
| 19 |
3 files changed, 9 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
index 14e8ad24e742..166db1d476f2 100644 |
| 23 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 24 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 25 |
@@ -3,10 +3,8 @@ |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
|
| 29 |
-MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 30 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 31 |
-inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 32 |
- python-any-r1 |
| 33 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 34 |
|
| 35 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 36 |
HOMEPAGE="https://llvm.org/" |
| 37 |
@@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" |
| 38 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 39 |
SLOT="$(ver_cut 1-3)" |
| 40 |
KEYWORDS="" |
| 41 |
-IUSE="+clang debug test elibc_glibc" |
| 42 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" |
| 43 |
# base targets |
| 44 |
IUSE+=" +libfuzzer +memprof +orc +profile +xray" |
| 45 |
# sanitizer targets, keep in sync with config-ix.cmake |
| 46 |
@@ -36,7 +34,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 47 |
# llvm-6 for new lit options |
| 48 |
DEPEND=" |
| 49 |
>=sys-devel/llvm-6 |
| 50 |
- virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 51 |
+ virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]" |
| 52 |
BDEPEND=" |
| 53 |
>=dev-util/cmake-3.16 |
| 54 |
clang? ( sys-devel/clang ) |
| 55 |
|
| 56 |
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 |
| 57 |
index 9c861d2942be..584e656370cc 100644 |
| 58 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 59 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 60 |
@@ -3,10 +3,8 @@ |
| 61 |
|
| 62 |
EAPI=7 |
| 63 |
|
| 64 |
-MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 65 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 66 |
-inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 67 |
- python-any-r1 |
| 68 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 69 |
|
| 70 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 71 |
HOMEPAGE="https://llvm.org/" |
| 72 |
@@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" |
| 73 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 74 |
SLOT="$(ver_cut 1-3)" |
| 75 |
KEYWORDS="" |
| 76 |
-IUSE="+clang debug test elibc_glibc" |
| 77 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" |
| 78 |
# base targets |
| 79 |
IUSE+=" +libfuzzer +memprof +orc +profile +xray" |
| 80 |
# sanitizer targets, keep in sync with config-ix.cmake |
| 81 |
@@ -36,7 +34,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 82 |
# llvm-6 for new lit options |
| 83 |
DEPEND=" |
| 84 |
>=sys-devel/llvm-6 |
| 85 |
- virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 86 |
+ virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]" |
| 87 |
BDEPEND=" |
| 88 |
>=dev-util/cmake-3.16 |
| 89 |
clang? ( sys-devel/clang ) |
| 90 |
|
| 91 |
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 |
| 92 |
index bfbb1896914d..300f5b58df57 100644 |
| 93 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 94 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 95 |
@@ -3,10 +3,8 @@ |
| 96 |
|
| 97 |
EAPI=7 |
| 98 |
|
| 99 |
-MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 100 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 101 |
-inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 102 |
- python-any-r1 |
| 103 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 104 |
|
| 105 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 106 |
HOMEPAGE="https://llvm.org/" |
| 107 |
@@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" |
| 108 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 109 |
SLOT="$(ver_cut 1-3)" |
| 110 |
KEYWORDS="" |
| 111 |
-IUSE="+clang debug test elibc_glibc" |
| 112 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test elibc_glibc" |
| 113 |
# base targets |
| 114 |
IUSE+=" +libfuzzer +memprof +orc +profile +xray" |
| 115 |
# sanitizer targets, keep in sync with config-ix.cmake |
| 116 |
@@ -36,7 +34,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 117 |
# llvm-6 for new lit options |
| 118 |
DEPEND=" |
| 119 |
>=sys-devel/llvm-6 |
| 120 |
- virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 121 |
+ virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]" |
| 122 |
BDEPEND=" |
| 123 |
>=dev-util/cmake-3.16 |
| 124 |
clang? ( sys-devel/clang ) |
Archives