[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/

[Michał Górny]

commit:     fbefb0fc3ed52f8c8cc626b087098a45e6148d7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 12:02:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 12:57:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbefb0fc

sys-libs/libcxxabi: Fix 15.x with USE=-libunwind

Still need to figure out USE=libunwind and tests.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild 
b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
index 15858fc7fc75..6655441055a6 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
@@ -24,6 +24,10 @@ RDEPEND="
                )
        )
 "
+# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
+RDEPEND+="
+       !<sys-libs/libcxx-15
+"
 # llvm-6 for new lit options
 DEPEND="
        ${RDEPEND}
@@ -83,14 +87,11 @@ multilib_src_configure() {
                # upstream is omitting standard search path for this
                # probably because gcc & clang are bundling their own unwind.h
                -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-               -DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
 
                -DLIBCXX_LIBDIR_SUFFIX=
                -DLIBCXX_ENABLE_SHARED=ON
                -DLIBCXX_ENABLE_STATIC=OFF
-               -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
                -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
                -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
                -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
                -DLIBCXX_HAS_GCC_S_LIB=OFF
@@ -123,8 +124,3 @@ multilib_src_test() {
 multilib_src_install() {
        DESTDIR="${D}" cmake_build install-cxxabi
 }
-
-multilib_src_install_all() {
-       insinto /usr/include/libcxxabi
-       doins -r "${WORKDIR}"/libcxxabi/include/.
-}