1 |
commit: fe2b8bb726162559078bc4578d874cb43aa962b3 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 19 19:48:24 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 19 20:10:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2b8bb7 |
7 |
|
8 |
sys-devel/llvm: Remove 7.0.9999 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
...-Clean-up-exported-values-update-for-shar.patch | 0 |
13 |
sys-devel/llvm/llvm-4.0.1-r1.ebuild | 2 +- |
14 |
sys-devel/llvm/llvm-5.0.2.ebuild | 2 +- |
15 |
sys-devel/llvm/llvm-6.0.1-r2.ebuild | 2 +- |
16 |
sys-devel/llvm/llvm-6.0.1.ebuild | 2 +- |
17 |
sys-devel/llvm/llvm-7.0.1.ebuild | 2 +- |
18 |
sys-devel/llvm/llvm-7.0.9999.ebuild | 258 --------------------- |
19 |
sys-devel/llvm/llvm-7.1.0.ebuild | 2 +- |
20 |
8 files changed, 6 insertions(+), 264 deletions(-) |
21 |
|
22 |
diff --git a/sys-devel/llvm/files/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
23 |
similarity index 100% |
24 |
rename from sys-devel/llvm/files/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
25 |
rename to sys-devel/llvm/files/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
26 |
|
27 |
diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild |
28 |
index 405b1bf4ea6..410573dc10b 100644 |
29 |
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild |
30 |
+++ b/sys-devel/llvm/llvm-4.0.1-r1.ebuild |
31 |
@@ -73,7 +73,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
32 |
src_prepare() { |
33 |
# Fix llvm-config for shared linking and sane flags |
34 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
35 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
36 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
37 |
|
38 |
# Backport the fix for dlclose() causing option parser mess |
39 |
# e.g. https://bugs.gentoo.org/617154 |
40 |
|
41 |
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild |
42 |
index 29bd7b64407..dbda3db29a2 100644 |
43 |
--- a/sys-devel/llvm/llvm-5.0.2.ebuild |
44 |
+++ b/sys-devel/llvm/llvm-5.0.2.ebuild |
45 |
@@ -76,7 +76,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
46 |
src_prepare() { |
47 |
# Fix llvm-config for shared linking and sane flags |
48 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
49 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
50 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
51 |
|
52 |
# Apply the backported patches |
53 |
eapply "${WORKDIR}/llvm-5.0.1-patchset" |
54 |
|
55 |
diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild b/sys-devel/llvm/llvm-6.0.1-r2.ebuild |
56 |
index b0e6b8982dc..7a983e01f19 100644 |
57 |
--- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild |
58 |
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild |
59 |
@@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
60 |
src_prepare() { |
61 |
# Fix llvm-config for shared linking and sane flags |
62 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
63 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
64 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
65 |
|
66 |
# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). |
67 |
eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch |
68 |
|
69 |
diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild |
70 |
index d4cb259ec03..fde2a075f4d 100644 |
71 |
--- a/sys-devel/llvm/llvm-6.0.1.ebuild |
72 |
+++ b/sys-devel/llvm/llvm-6.0.1.ebuild |
73 |
@@ -78,7 +78,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
74 |
src_prepare() { |
75 |
# Fix llvm-config for shared linking and sane flags |
76 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
77 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
78 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
79 |
|
80 |
# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). |
81 |
eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch |
82 |
|
83 |
diff --git a/sys-devel/llvm/llvm-7.0.1.ebuild b/sys-devel/llvm/llvm-7.0.1.ebuild |
84 |
index 9807a13f1bb..72fae375763 100644 |
85 |
--- a/sys-devel/llvm/llvm-7.0.1.ebuild |
86 |
+++ b/sys-devel/llvm/llvm-7.0.1.ebuild |
87 |
@@ -79,7 +79,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
88 |
src_prepare() { |
89 |
# Fix llvm-config for shared linking and sane flags |
90 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
91 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
92 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
93 |
|
94 |
# disable use of SDK on OSX, bug #568758 |
95 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
96 |
|
97 |
diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild |
98 |
deleted file mode 100644 |
99 |
index c361a226832..00000000000 |
100 |
--- a/sys-devel/llvm/llvm-7.0.9999.ebuild |
101 |
+++ /dev/null |
102 |
@@ -1,258 +0,0 @@ |
103 |
-# Copyright 1999-2018 Gentoo Foundation |
104 |
-# Distributed under the terms of the GNU General Public License v2 |
105 |
- |
106 |
-EAPI=6 |
107 |
- |
108 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
109 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
110 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
111 |
-PYTHON_COMPAT=( python2_7 ) |
112 |
- |
113 |
-inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \ |
114 |
- multiprocessing pax-utils python-any-r1 toolchain-funcs |
115 |
- |
116 |
-DESCRIPTION="Low Level Virtual Machine" |
117 |
-HOMEPAGE="https://llvm.org/" |
118 |
-SRC_URI="" |
119 |
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git |
120 |
- https://github.com/llvm-mirror/llvm.git" |
121 |
-EGIT_BRANCH="release_70" |
122 |
- |
123 |
-# Keep in sync with CMakeLists.txt |
124 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 |
125 |
- NVPTX PowerPC Sparc SystemZ X86 XCore ) |
126 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
127 |
- |
128 |
-# Additional licenses: |
129 |
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
130 |
-# 2. ARM backend: LLVM Software Grant by ARM. |
131 |
-# 3. MD5 code: public-domain. |
132 |
-# 4. Tests (not installed): |
133 |
-# a. gtest: BSD. |
134 |
-# b. YAML tests: MIT. |
135 |
- |
136 |
-LICENSE="UoI-NCSA rc BSD public-domain |
137 |
- llvm_targets_ARM? ( LLVM-Grant )" |
138 |
-SLOT="$(ver_cut 1)" |
139 |
-KEYWORDS="" |
140 |
-IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml |
141 |
- kernel_Darwin ${ALL_LLVM_TARGETS[*]}" |
142 |
-RESTRICT="!test? ( test )" |
143 |
- |
144 |
-RDEPEND=" |
145 |
- sys-libs/zlib:0= |
146 |
- exegesis? ( dev-libs/libpfm:= ) |
147 |
- gold? ( |
148 |
- || ( |
149 |
- >=sys-devel/binutils-2.31.1-r4:*[plugins] |
150 |
- <sys-devel/binutils-2.31.1-r4:*[cxx] |
151 |
- ) |
152 |
- ) |
153 |
- libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) |
154 |
- libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) |
155 |
- ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) |
156 |
- xar? ( app-arch/xar ) |
157 |
- xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )" |
158 |
-# configparser-3.2 breaks the build (3.3 or none at all are fine) |
159 |
-DEPEND="${RDEPEND} |
160 |
- dev-lang/perl |
161 |
- || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 |
162 |
- ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) |
163 |
- ) |
164 |
- kernel_Darwin? ( |
165 |
- <sys-libs/libcxx-$(ver_cut 1-3).9999 |
166 |
- >=sys-devel/binutils-apple-5.1 |
167 |
- ) |
168 |
- doc? ( dev-python/sphinx ) |
169 |
- gold? ( sys-libs/binutils-libs ) |
170 |
- libffi? ( virtual/pkgconfig ) |
171 |
- !!<dev-python/configparser-3.3.0.2 |
172 |
- ${PYTHON_DEPS}" |
173 |
-# There are no file collisions between these versions but having :0 |
174 |
-# installed means llvm-config there will take precedence. |
175 |
-RDEPEND="${RDEPEND} |
176 |
- !sys-devel/llvm:0" |
177 |
-PDEPEND="sys-devel/llvm-common |
178 |
- gold? ( >=sys-devel/llvmgold-${SLOT} )" |
179 |
- |
180 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
181 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
182 |
- |
183 |
-# least intrusive of all |
184 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
185 |
- |
186 |
-src_prepare() { |
187 |
- # Fix llvm-config for shared linking and sane flags |
188 |
- # https://bugs.gentoo.org/show_bug.cgi?id=565358 |
189 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
190 |
- |
191 |
- # disable use of SDK on OSX, bug #568758 |
192 |
- sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
193 |
- |
194 |
- # User patches + QA |
195 |
- cmake-utils_src_prepare |
196 |
-} |
197 |
- |
198 |
-multilib_src_configure() { |
199 |
- local ffi_cflags ffi_ldflags |
200 |
- if use libffi; then |
201 |
- ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
202 |
- ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
203 |
- fi |
204 |
- |
205 |
- local libdir=$(get_libdir) |
206 |
- local mycmakeargs=( |
207 |
- # disable appending VCS revision to the version to improve |
208 |
- # direct cache hit ratio |
209 |
- -DLLVM_APPEND_VC_REV=OFF |
210 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" |
211 |
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib} |
212 |
- |
213 |
- -DBUILD_SHARED_LIBS=ON |
214 |
- -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" |
215 |
- -DLLVM_BUILD_TESTS=$(usex test) |
216 |
- |
217 |
- -DLLVM_ENABLE_FFI=$(usex libffi) |
218 |
- -DLLVM_ENABLE_LIBEDIT=$(usex libedit) |
219 |
- -DLLVM_ENABLE_TERMINFO=$(usex ncurses) |
220 |
- -DLLVM_ENABLE_LIBXML2=$(usex xml) |
221 |
- -DLLVM_ENABLE_ASSERTIONS=$(usex debug) |
222 |
- -DLLVM_ENABLE_LIBPFM=$(usex exegesis) |
223 |
- -DLLVM_ENABLE_EH=ON |
224 |
- -DLLVM_ENABLE_RTTI=ON |
225 |
- |
226 |
- -DWITH_POLLY=OFF # TODO |
227 |
- |
228 |
- -DLLVM_HOST_TRIPLE="${CHOST}" |
229 |
- |
230 |
- -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" |
231 |
- -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" |
232 |
- # used only for llvm-objdump tool |
233 |
- -DHAVE_LIBXAR=$(multilib_native_usex xar 1 0) |
234 |
- |
235 |
- # disable OCaml bindings (now in dev-ml/llvm-ocaml) |
236 |
- -DOCAMLFIND=NO |
237 |
- ) |
238 |
- |
239 |
-# Note: go bindings have no CMake rules at the moment |
240 |
-# but let's kill the check in case they are introduced |
241 |
-# if ! multilib_is_native_abi || ! use go; then |
242 |
- mycmakeargs+=( |
243 |
- -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND |
244 |
- ) |
245 |
-# fi |
246 |
- |
247 |
- use test && mycmakeargs+=( |
248 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
249 |
- ) |
250 |
- |
251 |
- if multilib_is_native_abi; then |
252 |
- mycmakeargs+=( |
253 |
- -DLLVM_BUILD_DOCS=$(usex doc) |
254 |
- -DLLVM_ENABLE_OCAMLDOC=OFF |
255 |
- -DLLVM_ENABLE_SPHINX=$(usex doc) |
256 |
- -DLLVM_ENABLE_DOXYGEN=OFF |
257 |
- -DLLVM_INSTALL_UTILS=ON |
258 |
- ) |
259 |
- use doc && mycmakeargs+=( |
260 |
- -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" |
261 |
- -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
262 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
263 |
- ) |
264 |
- use gold && mycmakeargs+=( |
265 |
- -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include |
266 |
- ) |
267 |
- fi |
268 |
- |
269 |
- if tc-is-cross-compiler; then |
270 |
- local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" |
271 |
- [[ -x "${tblgen}" ]] \ |
272 |
- || die "${tblgen} not found or usable" |
273 |
- mycmakeargs+=( |
274 |
- -DCMAKE_CROSSCOMPILING=ON |
275 |
- -DLLVM_TABLEGEN="${tblgen}" |
276 |
- ) |
277 |
- fi |
278 |
- |
279 |
- # workaround BMI bug in gcc-7 (fixed in 7.4) |
280 |
- # https://bugs.gentoo.org/649880 |
281 |
- # apply only to x86, https://bugs.gentoo.org/650506 |
282 |
- if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && |
283 |
- [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] |
284 |
- then |
285 |
- local CFLAGS="${CFLAGS} -mno-bmi" |
286 |
- local CXXFLAGS="${CXXFLAGS} -mno-bmi" |
287 |
- fi |
288 |
- |
289 |
- # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
290 |
- use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
291 |
- cmake-utils_src_configure |
292 |
-} |
293 |
- |
294 |
-multilib_src_compile() { |
295 |
- cmake-utils_src_compile |
296 |
- |
297 |
- pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld |
298 |
- pax-mark m "${BUILD_DIR}"/bin/lli |
299 |
- pax-mark m "${BUILD_DIR}"/bin/lli-child-target |
300 |
- |
301 |
- if use test; then |
302 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests |
303 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests |
304 |
- pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests |
305 |
- fi |
306 |
-} |
307 |
- |
308 |
-multilib_src_test() { |
309 |
- # respect TMPDIR! |
310 |
- local -x LIT_PRESERVES_TMP=1 |
311 |
- cmake-utils_src_make check |
312 |
-} |
313 |
- |
314 |
-src_install() { |
315 |
- local MULTILIB_CHOST_TOOLS=( |
316 |
- /usr/lib/llvm/${SLOT}/bin/llvm-config |
317 |
- ) |
318 |
- |
319 |
- local MULTILIB_WRAPPED_HEADERS=( |
320 |
- /usr/include/llvm/Config/llvm-config.h |
321 |
- ) |
322 |
- |
323 |
- local LLVM_LDPATHS=() |
324 |
- multilib-minimal_src_install |
325 |
- |
326 |
- # move wrapped headers back |
327 |
- mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die |
328 |
-} |
329 |
- |
330 |
-multilib_src_install() { |
331 |
- cmake-utils_src_install |
332 |
- |
333 |
- # move headers to /usr/include for wrapping |
334 |
- rm -rf "${ED%/}"/usr/include || die |
335 |
- mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die |
336 |
- |
337 |
- LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) |
338 |
-} |
339 |
- |
340 |
-multilib_src_install_all() { |
341 |
- local revord=$(( 9999 - ${SLOT} )) |
342 |
- newenvd - "10llvm-${revord}" <<-_EOF_ |
343 |
- PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
344 |
- # we need to duplicate it in ROOTPATH for Portage to respect... |
345 |
- ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
346 |
- MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" |
347 |
- LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" |
348 |
- _EOF_ |
349 |
- |
350 |
- docompress "/usr/lib/llvm/${SLOT}/share/man" |
351 |
-} |
352 |
- |
353 |
-pkg_postinst() { |
354 |
- elog "You can find additional opt-viewer utility scripts in:" |
355 |
- elog " ${EROOT%/}/usr/lib/llvm/${SLOT}/share/opt-viewer" |
356 |
- elog "To use these scripts, you will need Python 2.7 along with the following" |
357 |
- elog "packages:" |
358 |
- elog " dev-python/pygments (for opt-viewer)" |
359 |
- elog " dev-python/pyyaml (for all of them)" |
360 |
-} |
361 |
|
362 |
diff --git a/sys-devel/llvm/llvm-7.1.0.ebuild b/sys-devel/llvm/llvm-7.1.0.ebuild |
363 |
index b7dd83e3536..a708957fea0 100644 |
364 |
--- a/sys-devel/llvm/llvm-7.1.0.ebuild |
365 |
+++ b/sys-devel/llvm/llvm-7.1.0.ebuild |
366 |
@@ -84,7 +84,7 @@ CMAKE_BUILD_TYPE=RelWithDebInfo |
367 |
src_prepare() { |
368 |
# Fix llvm-config for shared linking and sane flags |
369 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
370 |
- eapply "${FILESDIR}"/7.0.9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
371 |
+ eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
372 |
|
373 |
# disable use of SDK on OSX, bug #568758 |
374 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |