From 9609116cc9416ac04adf57a9cf8903ea736c1dbc Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 20 Jun 2020 23:08:29 +0200 Subject: sys-devel/llvm: Dedupe with new eclass code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/llvm/llvm-10.0.1.9999.ebuild | 14 ++++---------- sys-devel/llvm/llvm-10.0.1_rc1.ebuild | 14 ++++---------- sys-devel/llvm/llvm-11.0.0.9999.ebuild | 14 ++++---------- 3 files changed, 12 insertions(+), 30 deletions(-) (limited to 'sys-devel/llvm') diff --git a/sys-devel/llvm/llvm-10.0.1.9999.ebuild b/sys-devel/llvm/llvm-10.0.1.9999.ebuild index 27af603d49b5..6bf2a545f962 100644 --- a/sys-devel/llvm/llvm-10.0.1.9999.ebuild +++ b/sys-devel/llvm/llvm-10.0.1.9999.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" @@ -70,9 +70,6 @@ RDEPEND="${RDEPEND} PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - PATCHES=( # Fix linking to dylib and .a libs simultaneously "${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch @@ -198,10 +195,7 @@ src_prepare() { # Verify that the live ebuild is up-to-date check_live_ebuild - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare } # Is LLVM being linked against libc++? @@ -399,7 +393,7 @@ multilib_src_configure() { # fi use test && mycmakeargs+=( - -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/llvm/llvm-10.0.1_rc1.ebuild b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild index 36ee1f6d95dc..5ac7c6e2a8c3 100644 --- a/sys-devel/llvm/llvm-10.0.1_rc1.ebuild +++ b/sys-devel/llvm/llvm-10.0.1_rc1.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" @@ -70,9 +70,6 @@ RDEPEND="${RDEPEND} PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - PATCHES=( # Fix linking to dylib and .a libs simultaneously "${FILESDIR}"/10.0.1/0001-llvm-Avoid-linking-llvm-cfi-verify-to-duplicate-libs.patch @@ -163,10 +160,7 @@ src_prepare() { sed -i -e '/source_parsers/d' docs/conf.py || die fi - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare } # Is LLVM being linked against libc++? @@ -364,7 +358,7 @@ multilib_src_configure() { # fi use test && mycmakeargs+=( - -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/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild index 5af65c0f4a0d..e005e516f322 100644 --- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild @@ -4,8 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python3_{6..9} ) -inherit cmake llvm.org multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" @@ -70,9 +70,6 @@ RDEPEND="${RDEPEND} PDEPEND="sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-${SLOT} )" -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { if use doc; then has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" || @@ -192,10 +189,7 @@ src_prepare() { # Verify that the live ebuild is up-to-date check_live_ebuild - # cmake eclasses suck by forcing ${S} here - CMAKE_USE_DIR=${S} \ - S=${WORKDIR} \ - cmake_src_prepare + llvm.org_src_prepare } # Is LLVM being linked against libc++? @@ -395,7 +389,7 @@ multilib_src_configure() { # fi use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" + -DLLVM_LIT_ARGS="$(get_lit_flags)" ) if multilib_is_native_abi; then -- cgit v1.2.3-65-gdbad