diff options
author | Michał Górny <mgorny@gentoo.org> | 2020-06-20 23:08:40 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2020-06-23 20:30:53 +0200 |
commit | 2a6a282c884969a04a3ac75c5de5e5bd02aeb413 (patch) | |
tree | 04d5eee4875e1f19bbe1e195d131fdc4b5e118a7 /sys-libs | |
parent | sys-libs/llvm-libunwind: Dedupe with new eclass code (diff) | |
download | gentoo-2a6a282c884969a04a3ac75c5de5e5bd02aeb413.tar.gz gentoo-2a6a282c884969a04a3ac75c5de5e5bd02aeb413.tar.bz2 gentoo-2a6a282c884969a04a3ac75c5de5e5bd02aeb413.zip |
sys-libs/libcxxabi: Dedupe with new eclass code
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild | 16 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild | 16 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 16 |
3 files changed, 6 insertions, 42 deletions
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild index a1236effd156..41a864c31acd 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.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 diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild index a1236effd156..41a864c31acd 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.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 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 |