From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D2CD31382C5 for ; Tue, 23 Jun 2020 18:31:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16518E091D; Tue, 23 Jun 2020 18:31:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6504E091D for ; Tue, 23 Jun 2020 18:31:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9C5C34F22D for ; Tue, 23 Jun 2020 18:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12C232BD for ; Tue, 23 Jun 2020 18:30:59 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1592937046.f4078f916d851ae33e8404e05b9cd3eab8a60983.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-10.0.1.9999.ebuild sys-devel/clang/clang-10.0.1_rc1.ebuild sys-devel/clang/clang-11.0.0.9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: f4078f916d851ae33e8404e05b9cd3eab8a60983 X-VCS-Branch: master Date: Tue, 23 Jun 2020 18:30:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 661a1abf-eed8-432d-9a05-34e362be7476 X-Archives-Hash: 77003268fe2b62a4b4c79bf01cbbc6b6 commit: f4078f916d851ae33e8404e05b9cd3eab8a60983 Author: Michał Górny gentoo org> AuthorDate: Sat Jun 20 21:08:35 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jun 23 18:30:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4078f91 sys-devel/clang: Dedupe with new eclass code Signed-off-by: Michał Górny 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 8db3efe5b94..2b8d5fee058 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 bc6d83f42a8..db3798d217b 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 76c40cb7104..5991c42d4c6 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