1 |
commit: 0f4c824257ed4dee36c34c3e1ab94cd190631afe |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 2 06:19:48 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 2 07:19:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4c8242 |
7 |
|
8 |
sys-devel/llvm: Remove 4.0.1 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-devel/llvm/Manifest | 2 - |
13 |
...Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch | 56 ----- |
14 |
sys-devel/llvm/llvm-4.0.1-r1.ebuild | 242 --------------------- |
15 |
3 files changed, 300 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest |
18 |
index 064f8f47d74..c8c1a8eac37 100644 |
19 |
--- a/sys-devel/llvm/Manifest |
20 |
+++ b/sys-devel/llvm/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d |
23 |
DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb |
24 |
DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb |
25 |
DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1 |
26 |
@@ -8,4 +7,3 @@ DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f |
27 |
DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a |
28 |
DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb |
29 |
DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f |
30 |
-DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415 |
31 |
|
32 |
diff --git a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch |
33 |
deleted file mode 100644 |
34 |
index b857136498b..00000000000 |
35 |
--- a/sys-devel/llvm/files/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch |
36 |
+++ /dev/null |
37 |
@@ -1,56 +0,0 @@ |
38 |
-From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001 |
39 |
-From: Michal Gorny <mgorny@g.o> |
40 |
-Date: Mon, 27 Nov 2017 22:23:09 +0000 |
41 |
-Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading |
42 |
- |
43 |
-Prevent unloading shared libraries on Linux when dlclose() is called. |
44 |
-This is necessary since command-line option parsing API relies on |
45 |
-registering the global option instances in the option parser instance |
46 |
-which can be loaded in a different shared library. |
47 |
- |
48 |
-Given that we can't reliably remove those options when a library is |
49 |
-unloaded, the parser ends up containing dangling references. Since glibc |
50 |
-has relatively complex library unloading rules, some of the LLVM |
51 |
-libraries can be unloaded while others (including the Support library) |
52 |
-stay loaded causing quite a mayhem. To reliably prevent that, just |
53 |
-forbid unloading all libraries -- it's a very bad idea anyway. |
54 |
- |
55 |
-While the issue arguably happens only with BUILD_SHARED_LIBS, it may |
56 |
-affect any library reusing llvm::cl interface. |
57 |
- |
58 |
-Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154. |
59 |
-Previously hit by Fedora back in Feb 2016: |
60 |
-https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html |
61 |
- |
62 |
-Differential Revision: https://reviews.llvm.org/D40459 |
63 |
- |
64 |
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8 |
65 |
---- |
66 |
- cmake/modules/HandleLLVMOptions.cmake | 8 ++++++++ |
67 |
- unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++++++ |
68 |
- 2 files changed, 15 insertions(+) |
69 |
- |
70 |
- 4.0.1 backport: removed the unittest part |
71 |
- |
72 |
-diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake |
73 |
-index c5390371845..b5059a8a60e 100644 |
74 |
---- a/cmake/modules/HandleLLVMOptions.cmake |
75 |
-+++ b/cmake/modules/HandleLLVMOptions.cmake |
76 |
-@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR |
77 |
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs") |
78 |
- endif() |
79 |
- |
80 |
-+# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded |
81 |
-+# by dlclose(). We need that since the CLI API relies on cross-references |
82 |
-+# between global objects which became horribly broken when one of the libraries |
83 |
-+# is unloaded. |
84 |
-+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
85 |
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete") |
86 |
-+endif() |
87 |
-+ |
88 |
- |
89 |
- function(append value) |
90 |
- foreach(variable ${ARGN}) |
91 |
--- |
92 |
-2.15.1 |
93 |
- |
94 |
|
95 |
diff --git a/sys-devel/llvm/llvm-4.0.1-r1.ebuild b/sys-devel/llvm/llvm-4.0.1-r1.ebuild |
96 |
deleted file mode 100644 |
97 |
index 83f6f64dba2..00000000000 |
98 |
--- a/sys-devel/llvm/llvm-4.0.1-r1.ebuild |
99 |
+++ /dev/null |
100 |
@@ -1,242 +0,0 @@ |
101 |
-# Copyright 1999-2018 Gentoo Foundation |
102 |
-# Distributed under the terms of the GNU General Public License v2 |
103 |
- |
104 |
-EAPI=6 |
105 |
- |
106 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
107 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
108 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
109 |
-PYTHON_COMPAT=( python2_7 ) |
110 |
- |
111 |
-inherit cmake-utils flag-o-matic multilib-minimal pax-utils \ |
112 |
- python-any-r1 toolchain-funcs versionator |
113 |
- |
114 |
-DESCRIPTION="Low Level Virtual Machine" |
115 |
-HOMEPAGE="https://llvm.org/" |
116 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz |
117 |
- !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )" |
118 |
- |
119 |
-# Keep in sync with CMakeLists.txt |
120 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 |
121 |
- NVPTX PowerPC RISCV Sparc SystemZ X86 XCore ) |
122 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
123 |
- |
124 |
-# Additional licenses: |
125 |
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
126 |
-# 2. ARM backend: LLVM Software Grant by ARM. |
127 |
-# 3. MD5 code: public-domain. |
128 |
-# 4. Tests (not installed): |
129 |
-# a. gtest: BSD. |
130 |
-# b. YAML tests: MIT. |
131 |
- |
132 |
-LICENSE="UoI-NCSA rc BSD public-domain |
133 |
- llvm_targets_ARM? ( LLVM-Grant )" |
134 |
-SLOT="$(get_major_version)" |
135 |
-KEYWORDS="amd64 arm ~arm64 x86" |
136 |
-IUSE="debug doc gold libedit +libffi ncurses test |
137 |
- elibc_musl kernel_Darwin ${ALL_LLVM_TARGETS[*]}" |
138 |
- |
139 |
-RDEPEND=" |
140 |
- sys-libs/zlib:0= |
141 |
- gold? ( |
142 |
- || ( |
143 |
- >=sys-devel/binutils-2.31.1-r4:*[plugins] |
144 |
- <sys-devel/binutils-2.31.1-r4:*[cxx] |
145 |
- ) |
146 |
- ) |
147 |
- libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) |
148 |
- libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) |
149 |
- ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )" |
150 |
-# configparser-3.2 breaks the build (3.3 or none at all are fine) |
151 |
-DEPEND="${RDEPEND} |
152 |
- dev-lang/perl |
153 |
- || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 |
154 |
- ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) |
155 |
- ) |
156 |
- || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 ) |
157 |
- kernel_Darwin? ( <sys-libs/libcxx-$(get_version_component_range 1-3).9999 ) |
158 |
- doc? ( dev-python/sphinx ) |
159 |
- gold? ( sys-libs/binutils-libs ) |
160 |
- libffi? ( virtual/pkgconfig ) |
161 |
- !!<dev-python/configparser-3.3.0.2 |
162 |
- ${PYTHON_DEPS}" |
163 |
-# There are no file collisions between these versions but having :0 |
164 |
-# installed means llvm-config there will take precedence. |
165 |
-RDEPEND="${RDEPEND} |
166 |
- !sys-devel/llvm:0" |
167 |
-PDEPEND="sys-devel/llvm-common |
168 |
- gold? ( >=sys-devel/llvmgold-${SLOT} )" |
169 |
- |
170 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE} |
171 |
- || ( ${ALL_LLVM_TARGETS[*]} )" |
172 |
- |
173 |
-S=${WORKDIR}/${P/_/}.src |
174 |
- |
175 |
-# least intrusive of all |
176 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
177 |
- |
178 |
-src_prepare() { |
179 |
- # Fix llvm-config for shared linking and sane flags |
180 |
- # https://bugs.gentoo.org/show_bug.cgi?id=565358 |
181 |
- eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
182 |
- |
183 |
- # Backport the fix for dlclose() causing option parser mess |
184 |
- # e.g. https://bugs.gentoo.org/617154 |
185 |
- eapply "${FILESDIR}"/4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch |
186 |
- |
187 |
- # gcc-8 build failure |
188 |
- eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch |
189 |
- |
190 |
- # Remove failing test (fixed in newer versions) |
191 |
- rm test/tools/llvm-symbolizer/print_context.c || die |
192 |
- |
193 |
- # support building llvm against musl-libc |
194 |
- use elibc_musl && eapply "${FILESDIR}"/9999/musl-fixes.patch |
195 |
- |
196 |
- # disable use of SDK on OSX, bug #568758 |
197 |
- sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
198 |
- |
199 |
- # User patches + QA |
200 |
- cmake-utils_src_prepare |
201 |
-} |
202 |
- |
203 |
-multilib_src_configure() { |
204 |
- local ffi_cflags ffi_ldflags |
205 |
- if use libffi; then |
206 |
- ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
207 |
- ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
208 |
- fi |
209 |
- |
210 |
- local libdir=$(get_libdir) |
211 |
- local mycmakeargs=( |
212 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" |
213 |
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib} |
214 |
- |
215 |
- -DBUILD_SHARED_LIBS=ON |
216 |
- -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" |
217 |
- -DLLVM_BUILD_TESTS=$(usex test) |
218 |
- |
219 |
- -DLLVM_ENABLE_FFI=$(usex libffi) |
220 |
- -DLLVM_ENABLE_LIBEDIT=$(usex libedit) |
221 |
- -DLLVM_ENABLE_TERMINFO=$(usex ncurses) |
222 |
- -DLLVM_ENABLE_ASSERTIONS=$(usex debug) |
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 |
- |
233 |
- # disable OCaml bindings (now in dev-ml/llvm-ocaml) |
234 |
- -DOCAMLFIND=NO |
235 |
- ) |
236 |
- |
237 |
-# Note: go bindings have no CMake rules at the moment |
238 |
-# but let's kill the check in case they are introduced |
239 |
-# if ! multilib_is_native_abi || ! use go; then |
240 |
- mycmakeargs+=( |
241 |
- -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND |
242 |
- ) |
243 |
-# fi |
244 |
- |
245 |
- if multilib_is_native_abi; then |
246 |
- mycmakeargs+=( |
247 |
- -DLLVM_BUILD_DOCS=$(usex doc) |
248 |
- -DLLVM_ENABLE_OCAMLDOC=OFF |
249 |
- -DLLVM_ENABLE_SPHINX=$(usex doc) |
250 |
- -DLLVM_ENABLE_DOXYGEN=OFF |
251 |
- -DLLVM_INSTALL_UTILS=ON |
252 |
- ) |
253 |
- use doc && mycmakeargs+=( |
254 |
- -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
255 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
256 |
- ) |
257 |
- use gold && mycmakeargs+=( |
258 |
- -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include |
259 |
- ) |
260 |
- fi |
261 |
- |
262 |
- if tc-is-cross-compiler; then |
263 |
- local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" |
264 |
- [[ -x "${tblgen}" ]] \ |
265 |
- || die "${tblgen} not found or usable" |
266 |
- mycmakeargs+=( |
267 |
- -DCMAKE_CROSSCOMPILING=ON |
268 |
- -DLLVM_TABLEGEN="${tblgen}" |
269 |
- ) |
270 |
- fi |
271 |
- |
272 |
- # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
273 |
- use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
274 |
- cmake-utils_src_configure |
275 |
-} |
276 |
- |
277 |
-multilib_src_compile() { |
278 |
- cmake-utils_src_compile |
279 |
- |
280 |
- pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld |
281 |
- pax-mark m "${BUILD_DIR}"/bin/lli |
282 |
- pax-mark m "${BUILD_DIR}"/bin/lli-child-target |
283 |
- |
284 |
- if use test; then |
285 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests |
286 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests |
287 |
- pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests |
288 |
- fi |
289 |
-} |
290 |
- |
291 |
-multilib_src_test() { |
292 |
- # respect TMPDIR! |
293 |
- local -x LIT_PRESERVES_TMP=1 |
294 |
- cmake-utils_src_make check |
295 |
-} |
296 |
- |
297 |
-src_install() { |
298 |
- local MULTILIB_CHOST_TOOLS=( |
299 |
- /usr/lib/llvm/${SLOT}/bin/llvm-config |
300 |
- ) |
301 |
- |
302 |
- local MULTILIB_WRAPPED_HEADERS=( |
303 |
- /usr/include/llvm/Config/llvm-config.h |
304 |
- ) |
305 |
- |
306 |
- local LLVM_LDPATHS=() |
307 |
- multilib-minimal_src_install |
308 |
- |
309 |
- # move wrapped headers back |
310 |
- mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die |
311 |
-} |
312 |
- |
313 |
-multilib_src_install() { |
314 |
- cmake-utils_src_install |
315 |
- |
316 |
- # move headers to /usr/include for wrapping |
317 |
- rm -rf "${ED%/}"/usr/include || die |
318 |
- mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die |
319 |
- |
320 |
- LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) |
321 |
-} |
322 |
- |
323 |
-multilib_src_install_all() { |
324 |
- local revord=$(( 9999 - ${SLOT} )) |
325 |
- cat <<-_EOF_ > "${T}/10llvm-${revord}" || die |
326 |
- PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
327 |
- # we need to duplicate it in ROOTPATH for Portage to respect... |
328 |
- ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
329 |
- MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" |
330 |
- LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" |
331 |
-_EOF_ |
332 |
- doenvd "${T}/10llvm-${revord}" |
333 |
- |
334 |
- # install pre-generated manpages |
335 |
- if ! use doc; then |
336 |
- # (doman does not support custom paths) |
337 |
- insinto "/usr/lib/llvm/${SLOT}/share/man/man1" |
338 |
- doins "${WORKDIR}/llvm-manpages-${PV}/llvm"/*.1 |
339 |
- fi |
340 |
- |
341 |
- docompress "/usr/lib/llvm/${SLOT}/share/man" |
342 |
-} |