From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild') diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild index b4d67fc8e6d6..534db9954d2c 100644 --- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_ECLASS=cmake PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs +inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" @@ -33,9 +33,6 @@ BDEPEND=" test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -45,13 +42,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - multilib_src_configure() { # link against compiler-rt instead of libgcc if we are using clang with libunwind local want_compiler_rt=OFF @@ -79,13 +69,11 @@ multilib_src_configure() { ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" ) fi cmake_src_configure -- cgit v1.2.3