| 1 |
commit: 78d58cf0c467bec6447f25eab75e5d0161245da4 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 29 20:34:19 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 29 20:34:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d58cf0 |
| 7 |
|
| 8 |
sys-libs/llvm-libunwind: Fix running tests in 14.x |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild | 5 ++--- |
| 13 |
1 file changed, 2 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild |
| 16 |
index cd73db419d28..c4a1e07a077f 100644 |
| 17 |
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild |
| 18 |
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.9999.ebuild |
| 19 |
@@ -105,16 +105,15 @@ wrap_libcxx() { |
| 20 |
-DLIBCXX_ENABLE_SHARED=OFF |
| 21 |
-DLIBCXX_ENABLE_STATIC=ON |
| 22 |
-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 23 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=ON |
| 24 |
-DLIBCXX_CXX_ABI=libcxxabi |
| 25 |
-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include |
| 26 |
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 27 |
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 28 |
-DLIBCXX_HAS_GCC_S_LIB=OFF |
| 29 |
-DLIBCXX_INCLUDE_TESTS=OFF |
| 30 |
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF |
| 31 |
) |
| 32 |
|
| 33 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib -L${BUILD_DIR}/$(get_libdir)" |
| 34 |
local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 35 |
local BUILD_DIR=${BUILD_DIR}/libcxx |
| 36 |
|
| 37 |
@@ -129,7 +128,7 @@ multilib_src_test() { |
| 38 |
wrap_libcxxabi cmake_src_configure |
| 39 |
wrap_libcxxabi cmake_src_compile |
| 40 |
wrap_libcxx cmake_src_compile |
| 41 |
- mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 42 |
+ mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/lib/" || die |
| 43 |
|
| 44 |
local -x LIT_PRESERVES_TMP=1 |
| 45 |
cmake_build check-unwind |
Archives