| 1 |
commit: fd0a3d077a7ec4d33caabf192c2cedb5a5e344b5 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 18:05:49 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 19:44:15 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0a3d07 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Remove USE=libunwind |
| 9 |
|
| 10 |
Remove explicit USE=libunwind since upstream broke the CMake support |
| 11 |
we were relying on. The ebuild will now either use gcc_s or compiler-rt |
| 12 |
+ libunwind depending on what the compiler is configured to use. |
| 13 |
|
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild | 15 +++------------ |
| 17 |
1 file changed, 3 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild |
| 20 |
index 81e3519d948a..308024bf9d49 100644 |
| 21 |
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild |
| 22 |
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild |
| 23 |
@@ -14,18 +14,10 @@ HOMEPAGE="https://libcxxabi.llvm.org/" |
| 24 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 25 |
SLOT="0" |
| 26 |
KEYWORDS="" |
| 27 |
-IUSE="+clang +libunwind static-libs test" |
| 28 |
+IUSE="+clang static-libs test" |
| 29 |
REQUIRED_USE="test? ( clang )" |
| 30 |
RESTRICT="!test? ( test )" |
| 31 |
|
| 32 |
-RDEPEND=" |
| 33 |
- libunwind? ( |
| 34 |
- || ( |
| 35 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 36 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 37 |
- ) |
| 38 |
- ) |
| 39 |
-" |
| 40 |
# in 15.x, cxxabi.h is moving from libcxx to libcxxabi |
| 41 |
RDEPEND+=" |
| 42 |
!<sys-libs/libcxx-15 |
| 43 |
@@ -74,9 +66,9 @@ multilib_src_configure() { |
| 44 |
strip-unsupported-flags |
| 45 |
fi |
| 46 |
|
| 47 |
- # link against compiler-rt instead of libgcc if we are using clang with libunwind |
| 48 |
+ # link against compiler-rt instead of libgcc if this is what clang does |
| 49 |
local want_compiler_rt=OFF |
| 50 |
- if use libunwind && tc-is-clang; then |
| 51 |
+ if tc-is-clang; then |
| 52 |
local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
| 53 |
${LDFLAGS} -print-libgcc-file-name) |
| 54 |
if [[ ${compiler_rt} == *libclang_rt* ]]; then |
| 55 |
@@ -94,7 +86,6 @@ multilib_src_configure() { |
| 56 |
-DLIBCXXABI_ENABLE_SHARED=ON |
| 57 |
-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 58 |
-DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 59 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 60 |
-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} |
| 61 |
|
| 62 |
# upstream is omitting standard search path for this |
Archives