gentoo auto-resync : 28:07:2022 - 21:05:25

3 files changed, 26 insertions, 14 deletions

diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index f2ec2a348122..6c069554ba5f 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -5,5 +5,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995
 EBUILD libcxxabi-13.0.1.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0
 EBUILD libcxxabi-14.0.4.ebuild 3522 BLAKE2B f62a0fabd80aeb3f67cc8a199b8b945cf6bcf42d7fa8287eb90a695a0f18129e43c6c31a15e350a999e482d372ac36612d94b25759a242b8a890e18ada743679 SHA512 74ebf7281951e8911ae842f6a1b6adf3dc0b906d17fc6cbec1c362aa8d7ae193c5f44ec1dfc1a3c40360c86f963533c6139012d4bd0ab2db5be98918d9627fa6
 EBUILD libcxxabi-14.0.6.ebuild 3526 BLAKE2B 35c39d56c9f067fe58be840ffac2e453678c58c95d483ae89483c536b0579dd220f1ef0755cf1fe46ea6ef337098c1885af613d4fe9b1821ad7019f24bcf7dc6 SHA512 1f24315fb3810cbfaeaebc13d54d0a46362da2c3fac6ff69027f075fffebbfb89a3479f98cc43bb28fbc8ab4dca2270749d9a666073384c60782f52ed79dd8f9
-EBUILD libcxxabi-15.0.0.9999.ebuild 3478 BLAKE2B 4a9508f17dbf7f1587915b565d9a572b20762c75dd1d89472df2ff4c01cb06b02c9d48bfa0a636b187d943fce1cfe3c826445ebd34657dcbe3b2314287fafc2d SHA512 79d6e8b143d1d4f8e08634eea94c5c02f175aca3f330ef008a95377dc03dc33fe8a9c36a77e7e636f74a365954020a57853a241b52ee246681703ae61f4bcadb
-MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13
+EBUILD libcxxabi-15.0.0.9999.ebuild 3552 BLAKE2B 739954f57a9b0d9bfea8eea36d66f31e165c8ea1e5caee6e42fe96a7e91b14d0c1e4d8f5175e83c4ef3467e12bd6f3e83af5cbd7bacef88bd47c65c390478d9b SHA512 08ed8cdd911575e091929723e10b3252569e9bfdc949be5cf75696f6a94b4c2932218aa4b0bbf94fc69a6bd0e815297695aedbde5ddb0a6e89029099af7d0226
+MISC metadata.xml 557 BLAKE2B 4f6b0acb7cfdf74971a6fd96051d9f9020141c6117333a8de42bd043935b7bff8d9942faabdf3b1c94597c460393f64eb7d3f7b7d49f39ecfd0094de460f563e SHA512 67a812ef768e681ae77ef6e13bccffcbe53b41e94901f0558b3c7acaf896605ca670c4bb5a690bd9afa3b5a76271341710520a6abc0024c18f437fabde20e847
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
index 15858fc7fc75..d16cb515b1e6 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
 KEYWORDS=""
-IUSE="+libunwind static-libs test"
+IUSE="+clang +libunwind static-libs test"
+REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -24,17 +25,23 @@ 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}
 	>=sys-devel/llvm-6
 "
 BDEPEND="
+	clang? (
+		sys-devel/clang
+	)
 	!test? (
 		${PYTHON_DEPS}
 	)
 	test? (
-		>=sys-devel/clang-3.9.0
 		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
 	)
 "
@@ -58,6 +65,14 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
+	if use clang && ! tc-is-clang; then
+		# Only do this conditionally to allow overriding with
+		# e.g. CC=clang-13 in case of breakage
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
 	# link against compiler-rt instead of libgcc if we are using clang with libunwind
 	local want_compiler_rt=OFF
 	if use libunwind && tc-is-clang; then
@@ -70,6 +85,7 @@ multilib_src_configure() {
 
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
+		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
 		-DPython3_EXECUTABLE="${PYTHON}"
 		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
 		-DLLVM_INCLUDE_TESTS=OFF
@@ -83,20 +99,16 @@ 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
 		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
 		-DLIBCXX_INCLUDE_TESTS=OFF
-		-DLIBCXX_TARGET_TRIPLE="${CHOST}"
 	)
 	if use test; then
 		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
@@ -104,7 +116,7 @@ multilib_src_configure() {
 
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
 			-DPython3_EXECUTABLE="${PYTHON}"
 		)
 	fi
@@ -123,8 +135,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/.
-}
diff --git a/sys-libs/libcxxabi/metadata.xml b/sys-libs/libcxxabi/metadata.xml
index 4e546195d6a6..6aba5e09cd41 100644
--- a/sys-libs/libcxxabi/metadata.xml
+++ b/sys-libs/libcxxabi/metadata.xml
@@ -5,6 +5,11 @@
 		<email>llvm@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="clang">Force building using installed clang (rather
+			than the default CC/CXX; required for testing).</flag>
 		<flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">llvm/llvm-project</remote-id>
+	</upstream>
 </pkgmetadata>