| 1 |
commit: 625c72824647153264673e16d56a4f1729417506 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 3 18:08:15 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 3 18:09:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625c7282 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: Add ABI_X86 flags |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 11 ++++++++++- |
| 13 |
sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 11 ++++++++++- |
| 14 |
sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 11 ++++++++++- |
| 15 |
3 files changed, 30 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index d6a1a16eb346..ef78484f7721 100644 |
| 19 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 20 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild |
| 21 |
@@ -3,8 +3,10 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 26 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 27 |
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 28 |
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 29 |
+ toolchain-funcs |
| 30 |
|
| 31 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 32 |
HOMEPAGE="https://llvm.org/" |
| 33 |
@@ -94,6 +96,13 @@ src_configure() { |
| 34 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 35 |
) |
| 36 |
|
| 37 |
+ if use amd64; then |
| 38 |
+ mycmakeargs+=( |
| 39 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 40 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 41 |
+ ) |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then |
| 45 |
mycmakeargs+=( |
| 46 |
# setting -isysroot is disabled with compiler-rt-prefix-paths.patch |
| 47 |
|
| 48 |
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 |
| 49 |
index 23214f0469bf..59324e768209 100644 |
| 50 |
--- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 51 |
+++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild |
| 52 |
@@ -3,8 +3,10 @@ |
| 53 |
|
| 54 |
EAPI=7 |
| 55 |
|
| 56 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 57 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 58 |
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 59 |
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 60 |
+ toolchain-funcs |
| 61 |
|
| 62 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 63 |
HOMEPAGE="https://llvm.org/" |
| 64 |
@@ -94,6 +96,13 @@ src_configure() { |
| 65 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 66 |
) |
| 67 |
|
| 68 |
+ if use amd64; then |
| 69 |
+ mycmakeargs+=( |
| 70 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 71 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 72 |
+ ) |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then |
| 76 |
mycmakeargs+=( |
| 77 |
# setting -isysroot is disabled with compiler-rt-prefix-paths.patch |
| 78 |
|
| 79 |
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 |
| 80 |
index 0928ea166320..f8402de337a2 100644 |
| 81 |
--- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 82 |
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild |
| 83 |
@@ -3,8 +3,10 @@ |
| 84 |
|
| 85 |
EAPI=7 |
| 86 |
|
| 87 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 88 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 89 |
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs |
| 90 |
+inherit cmake flag-o-matic llvm llvm.org multilib-build python-any-r1 \ |
| 91 |
+ toolchain-funcs |
| 92 |
|
| 93 |
DESCRIPTION="Compiler runtime library for clang (built-in part)" |
| 94 |
HOMEPAGE="https://llvm.org/" |
| 95 |
@@ -94,6 +96,13 @@ src_configure() { |
| 96 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 97 |
) |
| 98 |
|
| 99 |
+ if use amd64; then |
| 100 |
+ mycmakeargs+=( |
| 101 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 102 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 103 |
+ ) |
| 104 |
+ fi |
| 105 |
+ |
| 106 |
if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then |
| 107 |
mycmakeargs+=( |
| 108 |
# setting -isysroot is disabled with compiler-rt-prefix-paths.patch |
Archives