commit: fd0a3d077a7ec4d33caabf192c2cedb5a5e344b5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jul 31 18:05:49 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 31 19:44:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0a3d07
sys-libs/libcxxabi: Remove USE=libunwind Remove explicit USE=libunwind since upstream broke the CMake support we were relying on. The ebuild will now either use gcc_s or compiler-rt + libunwind depending on what the compiler is configured to use. Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild index 81e3519d948a..308024bf9d49 100644 --- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild @@ -14,18 +14,10 @@ HOMEPAGE="https://libcxxabi.llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="+clang +libunwind static-libs test" +IUSE="+clang static-libs test" REQUIRED_USE="test? ( clang )" RESTRICT="!test? ( test )" -RDEPEND=" - libunwind? ( - || ( - >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] - >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] - ) - ) -" # in 15.x, cxxabi.h is moving from libcxx to libcxxabi RDEPEND+=" !<sys-libs/libcxx-15 @@ -74,9 +66,9 @@ multilib_src_configure() { strip-unsupported-flags fi - # link against compiler-rt instead of libgcc if we are using clang with libunwind + # link against compiler-rt instead of libgcc if this is what clang does local want_compiler_rt=OFF - if use libunwind && tc-is-clang; then + if tc-is-clang; then local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ ${LDFLAGS} -print-libgcc-file-name) if [[ ${compiler_rt} == *libclang_rt* ]]; then @@ -94,7 +86,6 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) - -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} # upstream is omitting standard search path for this
