Signed-off-by: Michał Górny <mgo...@gentoo.org> --- sys-devel/clang/clang-10.0.1.9999.ebuild | 14 ++++---------- sys-devel/clang/clang-10.0.1_rc1.ebuild | 14 ++++---------- sys-devel/clang/clang-11.0.0.9999.ebuild | 14 ++++---------- 3 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/sys-devel/clang/clang-10.0.1.9999.ebuild b/sys-devel/clang/clang-10.0.1.9999.ebuild index 8db3efe5b94a..2b8d5fee0580 100644 --- a/sys-devel/clang/clang-10.0.1.9999.ebuild +++ b/sys-devel/clang/clang-10.0.1.9999.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multilib-minimal multiprocessing \ - pax-utils python-single-r1 toolchain-funcs +inherit cmake llvm llvm.org multilib-minimal pax-utils \ + python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" @@ -55,9 +55,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - # Multilib notes: # 1. ABI_* flags control ABIs libclang* is built for only. # 2. clang is always capable of compiling code for all ABIs for enabled @@ -85,10 +82,7 @@ src_prepare() { mkdir -p x/y || die BUILD_DIR=${WORKDIR}/x/y/clang - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare mv ../clang-tools-extra tools/extra || die } @@ -259,7 +253,7 @@ multilib_src_configure() { ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) if multilib_is_native_abi; then diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild b/sys-devel/clang/clang-10.0.1_rc1.ebuild index bc6d83f42a8d..db3798d217bd 100644 --- a/sys-devel/clang/clang-10.0.1_rc1.ebuild +++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multilib-minimal multiprocessing \ - pax-utils python-single-r1 toolchain-funcs +inherit cmake llvm llvm.org multilib-minimal pax-utils \ + python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" @@ -55,9 +55,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - # Multilib notes: # 1. ABI_* flags control ABIs libclang* is built for only. # 2. clang is always capable of compiling code for all ABIs for enabled @@ -85,10 +82,7 @@ src_prepare() { mkdir -p x/y || die BUILD_DIR=${WORKDIR}/x/y/clang - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare mv ../clang-tools-extra tools/extra || die } @@ -259,7 +253,7 @@ multilib_src_configure() { ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) if multilib_is_native_abi; then diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild index 76c40cb71042..5991c42d4c69 100644 --- a/sys-devel/clang/clang-11.0.0.9999.ebuild +++ b/sys-devel/clang/clang-11.0.0.9999.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm llvm.org multilib-minimal multiprocessing \ - pax-utils python-single-r1 toolchain-funcs +inherit cmake llvm llvm.org multilib-minimal pax-utils \ + python-single-r1 toolchain-funcs DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/" @@ -56,9 +56,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - # Multilib notes: # 1. ABI_* flags control ABIs libclang* is built for only. # 2. clang is always capable of compiling code for all ABIs for enabled @@ -80,10 +77,7 @@ src_prepare() { mkdir -p x/y || die BUILD_DIR=${WORKDIR}/x/y/clang - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare mv ../clang-tools-extra tools/extra || die } @@ -254,7 +248,7 @@ multilib_src_configure() { ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) if multilib_is_native_abi; then -- 2.27.0