summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2022-02-11 12:42:51 +0100
committerMichał Górny <mgorny@gentoo.org>2022-02-11 13:16:03 +0100
commitc213f608104d9dbadd5a1c847c88f377fdcda92b (patch)
tree0438b883de2ed6250508439cdc3876a95696c348 /sys-libs/libcxx
parentsys-libs/libcxxabi: Update 15.x for runtimes build (diff)
downloadgentoo-c213f608104d9dbadd5a1c847c88f377fdcda92b.tar.gz
gentoo-c213f608104d9dbadd5a1c847c88f377fdcda92b.tar.bz2
gentoo-c213f608104d9dbadd5a1c847c88f377fdcda92b.zip
sys-libs/libcxx: Update 15.x for runtimes build
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs/libcxx')
-rw-r--r--sys-libs/libcxx/libcxx-15.0.0.9999.ebuild15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
index 20569c4eb465..51f3ab4b2ac7 100644
--- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=sys-devel/llvm-6"
BDEPEND="
+ ${PYTHON_DEPS}
test? (
>=dev-util/cmake-3.16
>=sys-devel/clang-3.9.0
@@ -33,13 +34,12 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
)"
-DOCS=( CREDITS.TXT )
-
-LLVM_COMPONENTS=( libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
LLVM_PATCHSET=9999-1
llvm.org_set_globals
python_check_deps() {
+ use test || return 0
has_version "dev-python/lit[${PYTHON_USEDEP}]"
}
@@ -50,7 +50,7 @@ pkg_setup() {
if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
llvm_pkg_setup
fi
- use test && python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
if ! use libcxxabi && ! tc-is-gcc ; then
eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
@@ -121,7 +121,11 @@ multilib_src_configure() {
local libdir=$(get_libdir)
local mycmakeargs=(
- -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
+ -DPython3_EXECUTABLE="${PYTHON}"
+ -DLLVM_ENABLE_RUNTIMES=libcxx
+ -DLLVM_INCLUDE_TESTS=OFF
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
-DLIBCXX_ENABLE_SHARED=ON
-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-DLIBCXX_CXX_ABI=${cxxabi}
@@ -130,6 +134,7 @@ multilib_src_configure() {
-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF
-DLIBCXX_INCLUDE_TESTS=$(usex test)
-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}