| 1 |
commit: 3cd6d3273c98da84571084ce2e814c2bbb2d6bb3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 3 18:06:10 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 3 18:09:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd6d327 |
| 7 |
|
| 8 |
sys-libs/compiler-rt-sanitizers: Add ABI_X86 flags |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
.../compiler-rt-sanitizers-13.0.1.9999.ebuild | 14 ++++++++++++-- |
| 13 |
.../compiler-rt-sanitizers-13.0.1_rc1.ebuild | 14 ++++++++++++-- |
| 14 |
.../compiler-rt-sanitizers-14.0.0.9999.ebuild | 14 ++++++++++++-- |
| 15 |
3 files changed, 36 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 80c9d7d0f6b4..14e8ad24e742 100644 |
| 19 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild |
| 20 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-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 check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 28 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 29 |
+ python-any-r1 |
| 30 |
|
| 31 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 32 |
HOMEPAGE="https://llvm.org/" |
| 33 |
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 34 |
# llvm-6 for new lit options |
| 35 |
DEPEND=" |
| 36 |
>=sys-devel/llvm-6 |
| 37 |
- virtual/libcrypt" |
| 38 |
+ virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 39 |
BDEPEND=" |
| 40 |
>=dev-util/cmake-3.16 |
| 41 |
clang? ( sys-devel/clang ) |
| 42 |
@@ -137,6 +139,14 @@ src_configure() { |
| 43 |
|
| 44 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 45 |
) |
| 46 |
+ |
| 47 |
+ if use amd64; then |
| 48 |
+ mycmakeargs+=( |
| 49 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 50 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 51 |
+ ) |
| 52 |
+ fi |
| 53 |
+ |
| 54 |
if use test; then |
| 55 |
mycmakeargs+=( |
| 56 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 57 |
|
| 58 |
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 |
| 59 |
index 8c47c346f451..9c861d2942be 100644 |
| 60 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 61 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild |
| 62 |
@@ -3,8 +3,10 @@ |
| 63 |
|
| 64 |
EAPI=7 |
| 65 |
|
| 66 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 67 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 68 |
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 69 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 70 |
+ python-any-r1 |
| 71 |
|
| 72 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 73 |
HOMEPAGE="https://llvm.org/" |
| 74 |
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 75 |
# llvm-6 for new lit options |
| 76 |
DEPEND=" |
| 77 |
>=sys-devel/llvm-6 |
| 78 |
- virtual/libcrypt" |
| 79 |
+ virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 80 |
BDEPEND=" |
| 81 |
>=dev-util/cmake-3.16 |
| 82 |
clang? ( sys-devel/clang ) |
| 83 |
@@ -137,6 +139,14 @@ src_configure() { |
| 84 |
|
| 85 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 86 |
) |
| 87 |
+ |
| 88 |
+ if use amd64; then |
| 89 |
+ mycmakeargs+=( |
| 90 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 91 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 92 |
+ ) |
| 93 |
+ fi |
| 94 |
+ |
| 95 |
if use test; then |
| 96 |
mycmakeargs+=( |
| 97 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 98 |
|
| 99 |
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 |
| 100 |
index 97edc3f19193..bfbb1896914d 100644 |
| 101 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 102 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild |
| 103 |
@@ -3,8 +3,10 @@ |
| 104 |
|
| 105 |
EAPI=7 |
| 106 |
|
| 107 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 108 |
PYTHON_COMPAT=( python3_{8..10} ) |
| 109 |
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 |
| 110 |
+inherit check-reqs cmake flag-o-matic llvm llvm.org multilib-build \ |
| 111 |
+ python-any-r1 |
| 112 |
|
| 113 |
DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
| 114 |
HOMEPAGE="https://llvm.org/" |
| 115 |
@@ -34,7 +36,7 @@ CLANG_SLOT=${SLOT%%.*} |
| 116 |
# llvm-6 for new lit options |
| 117 |
DEPEND=" |
| 118 |
>=sys-devel/llvm-6 |
| 119 |
- virtual/libcrypt" |
| 120 |
+ virtual/libcrypt[${MULTILIB_USEDEP}]" |
| 121 |
BDEPEND=" |
| 122 |
>=dev-util/cmake-3.16 |
| 123 |
clang? ( sys-devel/clang ) |
| 124 |
@@ -137,6 +139,14 @@ src_configure() { |
| 125 |
|
| 126 |
-DPython3_EXECUTABLE="${PYTHON}" |
| 127 |
) |
| 128 |
+ |
| 129 |
+ if use amd64; then |
| 130 |
+ mycmakeargs+=( |
| 131 |
+ -DCAN_TARGET_i386=$(usex abi_x86_32) |
| 132 |
+ -DCAN_TARGET_x86_64=$(usex abi_x86_64) |
| 133 |
+ ) |
| 134 |
+ fi |
| 135 |
+ |
| 136 |
if use test; then |
| 137 |
mycmakeargs+=( |
| 138 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
Archives