diff options
Diffstat (limited to 'sys-libs/libcxx')
-rw-r--r-- | sys-libs/libcxx/Manifest | 4 | ||||
-rw-r--r-- | sys-libs/libcxx/libcxx-15.0.0.9999.ebuild | 26 | ||||
-rw-r--r-- | sys-libs/libcxx/metadata.xml | 5 |
3 files changed, 26 insertions, 9 deletions
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest index d8c306e927e8..d04b96d9269b 100644 --- a/sys-libs/libcxx/Manifest +++ b/sys-libs/libcxx/Manifest @@ -9,5 +9,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995 EBUILD libcxx-13.0.1.ebuild 6780 BLAKE2B 575c9089d74bddc871e97147c53f7c298cd1683b989eba6b50601b45693c11d0647e3bd6f70c0a75caaea7ee3fea2f88f1bbad444d7f1785a62175337659e2e3 SHA512 f0ff78e48acca25cb925aee5106fba0d547ab8522ccfd65e2198d4f481f83abbadc415ac3808e45387fc945980f9892fdbda3b6a26d54163cebfa4f12fa17172 EBUILD libcxx-14.0.4.ebuild 6958 BLAKE2B e756b18011f0097115d4bc692fc4eb84c84d0ac68694b4611e4f73a032cb3b04e1137f7089b7b7dc4d0b37d1463465a791e468110c3c61438728eb90e7b9425f SHA512 fc0bde903c11f74f78f1d432bb0f5c15d002fd8c390719c6e4b9d77f1459c0397346b97c3cc51d75b34a486adb9b7992e646e5d043b3f278e46560d56e9d43cd EBUILD libcxx-14.0.6.ebuild 6962 BLAKE2B 30fbc7479159e802a39d793183e051372c29fab9eab17d60bef7dee9ab3563e04b8bee4f02971fff87a2a16030310c5a6dd9812e5eb011cfc066f7e60e13f3d3 SHA512 f592a190685a2b2c7ef07600d9ef268221c119d395cf4ed65e572ed179a147b308d5283a05b86d3761f5046ae7b9e18a1bf883cbef5b0b967e138cc72fc9c4d4 -EBUILD libcxx-15.0.0.9999.ebuild 6915 BLAKE2B 57856c3d8585b4661c87e41f73d033d6060ea8d9ee8adf6f0892bd88ed0d4aa5600f71fa59f4f4094103d8ed58a67ced6b245d11aefbc8c8d68b066fabde40c7 SHA512 c373d2052b681063a7939066866a2d52213626f588c022876dc8f36da5d37f0ddb87a31ae93708043d8a95b88a9e8f101e9c2a507a606b82fe507d1adc8f20ae -MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2 +EBUILD libcxx-15.0.0.9999.ebuild 7090 BLAKE2B b942c596f56b7211fd38e661897eda4ba85cf78da33bfbbe47388cd1b97b094bb49b39c27f93c7dae0d6f1e8092cb05364b50786d52b7fcb566bce5220935420 SHA512 271c58b03aea77076100a365cd8b5b5d7b20943d66cc0915344d1bba8c83693e2c053d6146c2a00246be1685ab1f14259eec207271a33133bd10f2a46c8999bb +MISC metadata.xml 828 BLAKE2B 40af456df8ac1cfdb66fd62a217abbb4ca837956529906118c35232000435d9e991d18dd0332b7b95eed70d4c7610c7a1aee80af8ba511763edc1423749a4aa4 SHA512 257f8fd05fcade26ca02305356b67c8e2d67a87b180e38a189a659212093b07b9a710b871fbaab894dba9eba5fe450b76c52cc82f6405c24cc1ab2df3abe8bfd diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild index dcdce79b90b2..25841a822b4c 100644 --- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild +++ b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild @@ -13,9 +13,12 @@ HOMEPAGE="https://libcxx.llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="+libcxxabi +libunwind static-libs test" +IUSE="+clang +libcxxabi +libunwind static-libs test" +REQUIRED_USE=" + libunwind? ( libcxxabi ) + test? ( clang ) +" RESTRICT="!test? ( test )" -REQUIRED_USE="libunwind? ( libcxxabi )" RDEPEND=" libcxxabi? ( @@ -31,12 +34,14 @@ DEPEND=" >=sys-devel/llvm-6 " BDEPEND=" + clang? ( + sys-devel/clang + ) !test? ( ${PYTHON_DEPS} ) test? ( >=dev-util/cmake-3.16 - >=sys-devel/clang-3.9.0 sys-devel/gdb[python] $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') ) @@ -79,7 +84,7 @@ src_configure() { local cxxabi cxxabi_incs if use libcxxabi; then cxxabi=system-libcxxabi - cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" + cxxabi_incs="${EPREFIX}/usr/include/c++/v1" else local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" cxxabi=libsupc++ @@ -90,6 +95,14 @@ src_configure() { } 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 + # we want -lgcc_s for unwinder, and for compiler runtime when using # gcc, clang with gcc runtime (or any unknown compiler) local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF @@ -129,6 +142,7 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( + -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" -DPython3_EXECUTABLE="${PYTHON}" -DLLVM_ENABLE_RUNTIMES=libcxx -DLLVM_INCLUDE_TESTS=OFF @@ -146,7 +160,6 @@ multilib_src_configure() { -DLIBCXX_INCLUDE_TESTS=$(usex test) -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} - -DLIBCXX_TARGET_TRIPLE="${CHOST}" -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" ) @@ -156,8 +169,7 @@ multilib_src_configure() { mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" - -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON + -DLLVM_LIT_ARGS="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) fi diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml index 437ced3c45e3..81bfc59aae3f 100644 --- a/sys-libs/libcxx/metadata.xml +++ b/sys-libs/libcxx/metadata.xml @@ -10,7 +10,12 @@ <name>LLVM Project</name> </maintainer> <use> + <flag name="clang">Force building using installed clang (rather + than the default CC/CXX; required for testing).</flag> <flag name="libcxxabi">Build on top of <pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag> <flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.</flag> </use> + <upstream> + <remote-id type="github">llvm/llvm-project</remote-id> + </upstream> </pkgmetadata> |