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 C8DB8138335 for ; Sun, 3 Nov 2019 11:46:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2DF1E08A5; Sun, 3 Nov 2019 11:46:31 +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 9EAB7E08A5 for ; Sun, 3 Nov 2019 11:46:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DED9834C789 for ; Sun, 3 Nov 2019 11:46:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01B278A4 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: <1572781569.d7f66c9b43333fa04b416bca54ae943124bfb9ea.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/llvm-10.0.0.9999.ebuild sys-devel/llvm/llvm-9.0.0.ebuild sys-devel/llvm/llvm-9.0.1.9999.ebuild X-VCS-Directories: sys-devel/llvm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d7f66c9b43333fa04b416bca54ae943124bfb9ea 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: ac0df6fd-adf7-4502-a174-2955eb8f30da X-Archives-Hash: 8343d9f34de4d4d61584c17053315ee6 commit: d7f66c9b43333fa04b416bca54ae943124bfb9ea Author: Michał Górny gentoo org> AuthorDate: Fri Nov 1 17:37:48 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 3 11:46:09 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f66c9b sys-devel/llvm: Port 9+ to llvm.org.eclass Signed-off-by: Michał Górny gentoo.org> sys-devel/llvm/llvm-10.0.0.9999.ebuild | 14 ++++---------- sys-devel/llvm/llvm-9.0.0.ebuild | 20 +++++++++++++++----- sys-devel/llvm/llvm-9.0.1.9999.ebuild | 15 ++++----------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild index 467c5badf2e..ac0af7a686a 100644 --- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild @@ -4,14 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake-utils llvm.org multilib-minimal multiprocessing \ + pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -S=${WORKDIR}/${P}/llvm +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Those are in lib/Targets, without explicit CMakeLists.txt mention ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR ) @@ -87,11 +86,6 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } -src_unpack() { - git-r3_fetch - git-r3_checkout '' '' '' llvm -} - check_live_ebuild() { local prod_targets=( $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.0.ebuild index 96e7ec6b1e7..a01238a0f75 100644 --- a/sys-devel/llvm/llvm-9.0.0.ebuild +++ b/sys-devel/llvm/llvm-9.0.0.ebuild @@ -4,15 +4,15 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake-utils llvm.org multilib-minimal multiprocessing \ + pax-utils python-any-r1 toolchain-funcs -MY_P=${P}.src DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz +SRC_URI=" !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )" -S=${WORKDIR}/${MY_P} +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with CMakeLists.txt ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -84,6 +84,16 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } +src_unpack() { + llvm.org_src_unpack + + if ! use doc; then + ebegin "Unpacking llvm-${PV}-manpages.tar.bz2" + tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die + eend + fi +} + src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358 diff --git a/sys-devel/llvm/llvm-9.0.1.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild index 26723e46b91..2f2597f5b16 100644 --- a/sys-devel/llvm/llvm-9.0.1.9999.ebuild +++ b/sys-devel/llvm/llvm-9.0.1.9999.ebuild @@ -4,15 +4,13 @@ EAPI=7 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake-utils llvm.org multilib-minimal multiprocessing \ + pax-utils python-any-r1 toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" -EGIT_BRANCH="release/9.x" -S=${WORKDIR}/${P}/llvm +LLVM_COMPONENTS=( llvm ) +llvm.org_set_globals # Keep in sync with CMakeLists.txt ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -84,11 +82,6 @@ python_check_deps() { has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" } -src_unpack() { - git-r3_fetch - git-r3_checkout '' '' '' llvm -} - src_prepare() { # Fix llvm-config for shared linking and sane flags # https://bugs.gentoo.org/show_bug.cgi?id=565358