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 521F0138334 for ; Sun, 3 Nov 2019 11:46:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 807DAE0919; Sun, 3 Nov 2019 11:46:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 3DC20E0901 for ; Sun, 3 Nov 2019 11:46:33 +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 19D1534C78F for ; Sun, 3 Nov 2019 11:46:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 623538A9 for ; Sun, 3 Nov 2019 11:46:28 +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: <1572781575.0dc937fa64c9597def8f11d54f3b3667fb6f072d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/lld/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/lld/lld-10.0.0.9999.ebuild sys-devel/lld/lld-9.0.0.ebuild sys-devel/lld/lld-9.0.1.9999.ebuild X-VCS-Directories: sys-devel/lld/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0dc937fa64c9597def8f11d54f3b3667fb6f072d X-VCS-Branch: master Date: Sun, 3 Nov 2019 11:46:28 +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: d73001d7-cb55-4703-b2ef-0fa5a42331d6 X-Archives-Hash: b2cfd034e842e602333d7c11c032f545 commit: 0dc937fa64c9597def8f11d54f3b3667fb6f072d Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 17:37:45 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 3 11:46:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc937fa sys-devel/lld: Port 9+ to llvm.org.eclass Signed-off-by: Michał Górny gentoo.org> sys-devel/lld/lld-10.0.0.9999.ebuild | 17 +++++------------ sys-devel/lld/lld-9.0.0.ebuild | 23 ++++------------------- sys-devel/lld/lld-9.0.1.9999.ebuild | 18 +++++------------- 3 files changed, 14 insertions(+), 44 deletions(-) diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild index 8f85d7aaad5..fed376f6958 100644 --- a/sys-devel/lld/lld-10.0.0.9999.ebuild +++ b/sys-devel/lld/lld-10.0.0.9999.ebuild @@ -4,13 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -S=${WORKDIR}/${P}/lld +LLVM_COMPONENTS=( lld ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -34,13 +34,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - local dirs=( lld ) - use test && dirs+=( llvm/utils/{lit,unittest} ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -49,7 +42,7 @@ src_configure() { ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" + -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)")}" ) diff --git a/sys-devel/lld/lld-9.0.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild index 44e6d89e4b6..ce499310894 100644 --- a/sys-devel/lld/lld-9.0.0.ebuild +++ b/sys-devel/lld/lld-9.0.0.ebuild @@ -4,16 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils llvm multiprocessing python-any-r1 - -MY_P=${P/_/}.src -LLVM_P=llvm-${PV/_/}.src +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz - test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )" -S=${WORKDIR}/${MY_P} +LLVM_COMPONENTS=( lld ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -37,18 +34,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - einfo "Unpacking ${MY_P}.tar.xz ..." - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die - - if use test; then - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ - "${LLVM_P}"/utils/{lit,unittest} || die - mv "${LLVM_P}" llvm || die - fi -} - src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON diff --git a/sys-devel/lld/lld-9.0.1.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild index b0cf74d960e..08b0bcbf80e 100644 --- a/sys-devel/lld/lld-9.0.1.9999.ebuild +++ b/sys-devel/lld/lld-9.0.1.9999.ebuild @@ -4,14 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 +inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 DESCRIPTION="The LLVM linker (link editor)" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -EGIT_BRANCH="release/9.x" -S=${WORKDIR}/${P}/lld +LLVM_COMPONENTS=( lld ) +LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) +llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" @@ -35,13 +34,6 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - local dirs=( lld ) - use test && dirs+=( llvm/utils/{lit,unittest} ) - git-r3_fetch - git-r3_checkout '' '' '' "${dirs[@]}" -} - src_configure() { local mycmakeargs=( -DBUILD_SHARED_LIBS=ON @@ -50,7 +42,7 @@ src_configure() { ) use test && mycmakeargs+=( -DLLVM_BUILD_TESTS=ON - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" + -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)")}" )