1 |
commit: 26a0e1837b030350ec638c3110fcbc2c2850e964 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 13 20:37:12 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 20 13:41:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a0e183 |
7 |
|
8 |
sys-devel/llvm: Switch 13+ to new targets API |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-devel/llvm/llvm-13.0.0.9999.ebuild | 22 ++++++---------------- |
13 |
sys-devel/llvm/llvm-13.0.0_rc2.ebuild | 22 ++++++---------------- |
14 |
sys-devel/llvm/llvm-14.0.0.9999.ebuild | 22 ++++++---------------- |
15 |
3 files changed, 18 insertions(+), 48 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/llvm/llvm-13.0.0.9999.ebuild b/sys-devel/llvm/llvm-13.0.0.9999.ebuild |
18 |
index ebe79aea74c..84ccd0ebedb 100644 |
19 |
--- a/sys-devel/llvm/llvm-13.0.0.9999.ebuild |
20 |
+++ b/sys-devel/llvm/llvm-13.0.0.9999.ebuild |
21 |
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ |
22 |
DESCRIPTION="Low Level Virtual Machine" |
23 |
HOMEPAGE="https://llvm.org/" |
24 |
|
25 |
-# Those are in lib/Targets, without explicit CMakeLists.txt mention |
26 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
27 |
-# Keep in sync with CMakeLists.txt |
28 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
29 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
30 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
31 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
32 |
- |
33 |
# Additional licenses: |
34 |
# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
35 |
# 2. xxhash: BSD. |
36 |
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" |
37 |
SLOT="$(ver_cut 1)" |
38 |
KEYWORDS="" |
39 |
IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 |
40 |
- kernel_Darwin ${ALL_LLVM_TARGETS[*]}" |
41 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
42 |
+ kernel_Darwin" |
43 |
RESTRICT="!test? ( test )" |
44 |
|
45 |
RDEPEND=" |
46 |
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common |
47 |
LLVM_COMPONENTS=( llvm ) |
48 |
LLVM_MANPAGES=build |
49 |
LLVM_PATCHSET=9999-1 |
50 |
+LLVM_USE_TARGETS=provide |
51 |
llvm.org_set_globals |
52 |
|
53 |
python_check_deps() { |
54 |
@@ -92,8 +84,6 @@ check_live_ebuild() { |
55 |
for i in "${all_targets[@]}"; do |
56 |
has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) |
57 |
done |
58 |
- # reorder |
59 |
- all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) |
60 |
|
61 |
if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then |
62 |
eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" |
63 |
@@ -102,10 +92,10 @@ check_live_ebuild() { |
64 |
eqawarn |
65 |
fi |
66 |
|
67 |
- if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then |
68 |
- eqawarn "ALL_LLVM_TARGETS is outdated!" |
69 |
- eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" |
70 |
- eqawarn "Expected: ${all_targets[*]}" |
71 |
+ if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then |
72 |
+ eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!" |
73 |
+ eqawarn " Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}" |
74 |
+ eqawarn "Expected: ${prod_targets[*]}" |
75 |
fi |
76 |
} |
77 |
|
78 |
|
79 |
diff --git a/sys-devel/llvm/llvm-13.0.0_rc2.ebuild b/sys-devel/llvm/llvm-13.0.0_rc2.ebuild |
80 |
index cc9415e5e56..31f75d41c82 100644 |
81 |
--- a/sys-devel/llvm/llvm-13.0.0_rc2.ebuild |
82 |
+++ b/sys-devel/llvm/llvm-13.0.0_rc2.ebuild |
83 |
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ |
84 |
DESCRIPTION="Low Level Virtual Machine" |
85 |
HOMEPAGE="https://llvm.org/" |
86 |
|
87 |
-# Those are in lib/Targets, without explicit CMakeLists.txt mention |
88 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
89 |
-# Keep in sync with CMakeLists.txt |
90 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
91 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
92 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
93 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
94 |
- |
95 |
# Additional licenses: |
96 |
# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
97 |
# 2. xxhash: BSD. |
98 |
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" |
99 |
SLOT="$(ver_cut 1)" |
100 |
KEYWORDS="" |
101 |
IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 |
102 |
- kernel_Darwin ${ALL_LLVM_TARGETS[*]}" |
103 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
104 |
+ kernel_Darwin" |
105 |
RESTRICT="!test? ( test )" |
106 |
|
107 |
RDEPEND=" |
108 |
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common |
109 |
LLVM_COMPONENTS=( llvm ) |
110 |
LLVM_MANPAGES=build |
111 |
LLVM_PATCHSET=13.0.0-rc2 |
112 |
+LLVM_USE_TARGETS=provide |
113 |
llvm.org_set_globals |
114 |
|
115 |
python_check_deps() { |
116 |
@@ -92,8 +84,6 @@ check_live_ebuild() { |
117 |
for i in "${all_targets[@]}"; do |
118 |
has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) |
119 |
done |
120 |
- # reorder |
121 |
- all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) |
122 |
|
123 |
if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then |
124 |
eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" |
125 |
@@ -102,10 +92,10 @@ check_live_ebuild() { |
126 |
eqawarn |
127 |
fi |
128 |
|
129 |
- if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then |
130 |
- eqawarn "ALL_LLVM_TARGETS is outdated!" |
131 |
- eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" |
132 |
- eqawarn "Expected: ${all_targets[*]}" |
133 |
+ if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then |
134 |
+ eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!" |
135 |
+ eqawarn " Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}" |
136 |
+ eqawarn "Expected: ${prod_targets[*]}" |
137 |
fi |
138 |
} |
139 |
|
140 |
|
141 |
diff --git a/sys-devel/llvm/llvm-14.0.0.9999.ebuild b/sys-devel/llvm/llvm-14.0.0.9999.ebuild |
142 |
index ebe79aea74c..84ccd0ebedb 100644 |
143 |
--- a/sys-devel/llvm/llvm-14.0.0.9999.ebuild |
144 |
+++ b/sys-devel/llvm/llvm-14.0.0.9999.ebuild |
145 |
@@ -10,14 +10,6 @@ inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ |
146 |
DESCRIPTION="Low Level Virtual Machine" |
147 |
HOMEPAGE="https://llvm.org/" |
148 |
|
149 |
-# Those are in lib/Targets, without explicit CMakeLists.txt mention |
150 |
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY M68k VE ) |
151 |
-# Keep in sync with CMakeLists.txt |
152 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430 |
153 |
- NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore |
154 |
- "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) |
155 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
156 |
- |
157 |
# Additional licenses: |
158 |
# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
159 |
# 2. xxhash: BSD. |
160 |
@@ -28,8 +20,7 @@ LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" |
161 |
SLOT="$(ver_cut 1)" |
162 |
KEYWORDS="" |
163 |
IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3 |
164 |
- kernel_Darwin ${ALL_LLVM_TARGETS[*]}" |
165 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
166 |
+ kernel_Darwin" |
167 |
RESTRICT="!test? ( test )" |
168 |
|
169 |
RDEPEND=" |
170 |
@@ -68,6 +59,7 @@ PDEPEND="sys-devel/llvm-common |
171 |
LLVM_COMPONENTS=( llvm ) |
172 |
LLVM_MANPAGES=build |
173 |
LLVM_PATCHSET=9999-1 |
174 |
+LLVM_USE_TARGETS=provide |
175 |
llvm.org_set_globals |
176 |
|
177 |
python_check_deps() { |
178 |
@@ -92,8 +84,6 @@ check_live_ebuild() { |
179 |
for i in "${all_targets[@]}"; do |
180 |
has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) |
181 |
done |
182 |
- # reorder |
183 |
- all_targets=( "${prod_targets[@]}" "${exp_targets[@]}" ) |
184 |
|
185 |
if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then |
186 |
eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" |
187 |
@@ -102,10 +92,10 @@ check_live_ebuild() { |
188 |
eqawarn |
189 |
fi |
190 |
|
191 |
- if [[ ${all_targets[*]} != ${ALL_LLVM_TARGETS[*]#llvm_targets_} ]]; then |
192 |
- eqawarn "ALL_LLVM_TARGETS is outdated!" |
193 |
- eqawarn " Have: ${ALL_LLVM_TARGETS[*]#llvm_targets_}" |
194 |
- eqawarn "Expected: ${all_targets[*]}" |
195 |
+ if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then |
196 |
+ eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!" |
197 |
+ eqawarn " Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}" |
198 |
+ eqawarn "Expected: ${prod_targets[*]}" |
199 |
fi |
200 |
} |