| 1 |
commit: 62918c71ef476e5e09f94a2291704111e1dd4a3f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 4 13:23:11 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 4 13:25:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62918c71 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Inline ABI_X86 flags to fix non-x86 arches |
| 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 |
sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 6 ++---- |
| 17 |
sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 6 ++---- |
| 18 |
sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 6 ++---- |
| 19 |
3 files changed, 6 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 22 |
index ef78484f7721..0a82b041cbde 100644 |
| 23 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 24 |
+++ b/sys-libs/compiler-rt/compiler-rt-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 cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 32 |
- toolchain-funcs |
| 33 |
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 34 |
|
| 35 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 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" |
| 42 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test" |
| 43 |
RESTRICT="!test? ( test ) !clang? ( test )" |
| 44 |
|
| 45 |
CLANG_SLOT=${SLOT%%.*} |
| 46 |
|
| 47 |
diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 48 |
index 59324e768209..3c0553bcebbd 100644 |
| 49 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 50 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 51 |
@@ -3,10 +3,8 @@ |
| 52 |
|
| 53 |
EAPI=7 |
| 54 |
|
| 55 |
-MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 56 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 57 |
-inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 58 |
- toolchain-funcs |
| 59 |
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 60 |
|
| 61 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 62 |
HOMEPAGE="https://llvm.org/" |
| 63 |
@@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" |
| 64 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 65 |
SLOT="$(ver_cut 1-3)" |
| 66 |
KEYWORDS="" |
| 67 |
-IUSE="+clang debug test" |
| 68 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test" |
| 69 |
RESTRICT="!test? ( test ) !clang? ( test )" |
| 70 |
|
| 71 |
CLANG_SLOT=${SLOT%%.*} |
| 72 |
|
| 73 |
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 74 |
index f8402de337a2..3d2048549e73 100644 |
| 75 |
--- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 76 |
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 77 |
@@ -3,10 +3,8 @@ |
| 78 |
|
| 79 |
EAPI=7 |
| 80 |
|
| 81 |
-MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 82 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 83 |
-inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 84 |
- toolchain-funcs |
| 85 |
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 86 |
|
| 87 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 88 |
HOMEPAGE="https://llvm.org/" |
| 89 |
@@ -14,7 +12,7 @@ HOMEPAGE="https://llvm.org/" |
| 90 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 91 |
SLOT="$(ver_cut 1-3)" |
| 92 |
KEYWORDS="" |
| 93 |
-IUSE="+clang debug test" |
| 94 |
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test" |
| 95 |
RESTRICT="!test? ( test ) !clang? ( test )" |
| 96 |
|
| 97 |
CLANG_SLOT=${SLOT%%.*} |
Archives