diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-06-20 23:08:39 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-06-23 20:30:50 +0200 |
| commit | 362a9d82b9750e819a2cf4d5f47e0a8fbfb4edb5 (patch) | |
| tree | 4017d450a6429219f17a0cd51058943a871eacff /sys-libs | |
| parent | sys-libs/compiler-rt: Dedupe with new eclass code (diff) | |
| download | gentoo-362a9d82b9750e819a2cf4d5f47e0a8fbfb4edb5.tar.gz gentoo-362a9d82b9750e819a2cf4d5f47e0a8fbfb4edb5.tar.bz2 gentoo-362a9d82b9750e819a2cf4d5f47e0a8fbfb4edb5.zip | |
sys-libs/compiler-rt-sanitizers: Dedupe with new eclass code
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-libs')
3 files changed, 6 insertions, 39 deletions
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild index 125a82e8a057..006db04567ad 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \ - python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -35,9 +34,6 @@ BDEPEND=" sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]" @@ -60,13 +56,6 @@ pkg_setup() { python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/compiler-rt_build @@ -96,7 +85,7 @@ src_configure() { mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild index 125a82e8a057..006db04567ad 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \ - python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -35,9 +34,6 @@ BDEPEND=" sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]" @@ -60,13 +56,6 @@ pkg_setup() { python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/compiler-rt_build @@ -96,7 +85,7 @@ src_configure() { mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild index 125a82e8a057..006db04567ad 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild @@ -4,8 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit check-reqs cmake flag-o-matic llvm llvm.org multiprocessing \ - python-any-r1 +inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/" @@ -35,9 +34,6 @@ BDEPEND=" sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { use test || return 0 has_version "dev-python/lit[${PYTHON_USEDEP}]" @@ -60,13 +56,6 @@ pkg_setup() { python-any-r1_pkg_setup } -src_prepare() { - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare -} - src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/compiler-rt_build @@ -96,7 +85,7 @@ src_configure() { mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" |