Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
Date: Sun, 03 Nov 2019 11:46:32
Message-Id: 1572781569.d7f66c9b43333fa04b416bca54ae943124bfb9ea.mgorny@gentoo
1 commit: d7f66c9b43333fa04b416bca54ae943124bfb9ea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 1 17:37:48 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 11:46:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f66c9b
7
8 sys-devel/llvm: Port 9+ to llvm.org.eclass
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/llvm/llvm-10.0.0.9999.ebuild | 14 ++++----------
13 sys-devel/llvm/llvm-9.0.0.ebuild | 20 +++++++++++++++-----
14 sys-devel/llvm/llvm-9.0.1.9999.ebuild | 15 ++++-----------
15 3 files changed, 23 insertions(+), 26 deletions(-)
16
17 diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
18 index 467c5badf2e..ac0af7a686a 100644
19 --- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
20 +++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
21 @@ -4,14 +4,13 @@
22 EAPI=7
23
24 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
25 -inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \
26 - python-any-r1 toolchain-funcs
27 +inherit cmake-utils llvm.org multilib-minimal multiprocessing \
28 + pax-utils python-any-r1 toolchain-funcs
29
30 DESCRIPTION="Low Level Virtual Machine"
31 HOMEPAGE="https://llvm.org/"
32 -SRC_URI=""
33 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
34 -S=${WORKDIR}/${P}/llvm
35 +LLVM_COMPONENTS=( llvm )
36 +llvm.org_set_globals
37
38 # Those are in lib/Targets, without explicit CMakeLists.txt mention
39 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
40 @@ -87,11 +86,6 @@ python_check_deps() {
41 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
42 }
43
44 -src_unpack() {
45 - git-r3_fetch
46 - git-r3_checkout '' '' '' llvm
47 -}
48 -
49 check_live_ebuild() {
50 local prod_targets=(
51 $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
52
53 diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.0.ebuild
54 index 96e7ec6b1e7..a01238a0f75 100644
55 --- a/sys-devel/llvm/llvm-9.0.0.ebuild
56 +++ b/sys-devel/llvm/llvm-9.0.0.ebuild
57 @@ -4,15 +4,15 @@
58 EAPI=7
59
60 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
61 -inherit cmake-utils multilib-minimal multiprocessing pax-utils \
62 - python-any-r1 toolchain-funcs
63 +inherit cmake-utils llvm.org multilib-minimal multiprocessing \
64 + pax-utils python-any-r1 toolchain-funcs
65
66 -MY_P=${P}.src
67 DESCRIPTION="Low Level Virtual Machine"
68 HOMEPAGE="https://llvm.org/"
69 -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
70 +SRC_URI="
71 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
72 -S=${WORKDIR}/${MY_P}
73 +LLVM_COMPONENTS=( llvm )
74 +llvm.org_set_globals
75
76 # Keep in sync with CMakeLists.txt
77 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
78 @@ -84,6 +84,16 @@ python_check_deps() {
79 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
80 }
81
82 +src_unpack() {
83 + llvm.org_src_unpack
84 +
85 + if ! use doc; then
86 + ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
87 + tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
88 + eend
89 + fi
90 +}
91 +
92 src_prepare() {
93 # Fix llvm-config for shared linking and sane flags
94 # https://bugs.gentoo.org/show_bug.cgi?id=565358
95
96 diff --git a/sys-devel/llvm/llvm-9.0.1.9999.ebuild b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
97 index 26723e46b91..2f2597f5b16 100644
98 --- a/sys-devel/llvm/llvm-9.0.1.9999.ebuild
99 +++ b/sys-devel/llvm/llvm-9.0.1.9999.ebuild
100 @@ -4,15 +4,13 @@
101 EAPI=7
102
103 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
104 -inherit cmake-utils git-r3 multilib-minimal multiprocessing pax-utils \
105 - python-any-r1 toolchain-funcs
106 +inherit cmake-utils llvm.org multilib-minimal multiprocessing \
107 + pax-utils python-any-r1 toolchain-funcs
108
109 DESCRIPTION="Low Level Virtual Machine"
110 HOMEPAGE="https://llvm.org/"
111 -SRC_URI=""
112 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
113 -EGIT_BRANCH="release/9.x"
114 -S=${WORKDIR}/${P}/llvm
115 +LLVM_COMPONENTS=( llvm )
116 +llvm.org_set_globals
117
118 # Keep in sync with CMakeLists.txt
119 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
120 @@ -84,11 +82,6 @@ python_check_deps() {
121 has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
122 }
123
124 -src_unpack() {
125 - git-r3_fetch
126 - git-r3_checkout '' '' '' llvm
127 -}
128 -
129 src_prepare() {
130 # Fix llvm-config for shared linking and sane flags
131 # https://bugs.gentoo.org/show_bug.cgi?id=565358