1 |
commit: a9ebef3936b8ab71e487565fac13602eca4395fe |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 2 07:28:31 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 9 19:02:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ebef39 |
7 |
|
8 |
sys-devel/llvm: Remove 5.0.2 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-devel/llvm/Manifest | 3 - |
13 |
...turn-type-in-ORC-readMem-client-interface.patch | 31 --- |
14 |
sys-devel/llvm/llvm-5.0.2.ebuild | 263 --------------------- |
15 |
3 files changed, 297 deletions(-) |
16 |
|
17 |
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest |
18 |
index aa3df95d0da..fff43bd5dee 100644 |
19 |
--- a/sys-devel/llvm/Manifest |
20 |
+++ b/sys-devel/llvm/Manifest |
21 |
@@ -1,6 +1,3 @@ |
22 |
-DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb |
23 |
-DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb |
24 |
-DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1 |
25 |
DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3 |
26 |
DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 |
27 |
DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f |
28 |
|
29 |
diff --git a/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch b/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch |
30 |
deleted file mode 100644 |
31 |
index 6eaacec77a8..00000000000 |
32 |
--- a/sys-devel/llvm/files/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch |
33 |
+++ /dev/null |
34 |
@@ -1,31 +0,0 @@ |
35 |
-From b25d5675b67bd08e25dd093aaaf8c8f4bb1f822e Mon Sep 17 00:00:00 2001 |
36 |
-From: Tilmann Scheller <tschelle@××××××.com> |
37 |
-Date: Thu, 1 Feb 2018 11:40:01 -0600 |
38 |
-Subject: [PATCH] Fix return type in ORC readMem() client interface. |
39 |
- |
40 |
-GCC 8.0.1 detects the type mismatch and causes the compilation to fail. Clang |
41 |
-and earlier versions of GCC don't detect the issue. |
42 |
- |
43 |
-Fixes rhbz#1540620. |
44 |
---- |
45 |
- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h | 4 ++-- |
46 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
47 |
- |
48 |
-diff --git a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h |
49 |
-index da02250ba16..bed472e2e0e 100644 |
50 |
---- a/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h |
51 |
-+++ b/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h |
52 |
-@@ -713,8 +713,8 @@ private: |
53 |
- |
54 |
- uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } |
55 |
- |
56 |
-- Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src, |
57 |
-- uint64_t Size) { |
58 |
-+ Expected<std::vector<uint8_t>> readMem(char *Dst, JITTargetAddress Src, |
59 |
-+ uint64_t Size) { |
60 |
- // Check for an 'out-of-band' error, e.g. from an MM destructor. |
61 |
- if (ExistingError) |
62 |
- return std::move(ExistingError); |
63 |
--- |
64 |
-2.18.0 |
65 |
- |
66 |
|
67 |
diff --git a/sys-devel/llvm/llvm-5.0.2.ebuild b/sys-devel/llvm/llvm-5.0.2.ebuild |
68 |
deleted file mode 100644 |
69 |
index 840938cac7c..00000000000 |
70 |
--- a/sys-devel/llvm/llvm-5.0.2.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,263 +0,0 @@ |
73 |
-# Copyright 1999-2019 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI=6 |
77 |
- |
78 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
79 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
80 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
81 |
-PYTHON_COMPAT=( python2_7 ) |
82 |
- |
83 |
-inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \ |
84 |
- pax-utils python-any-r1 toolchain-funcs |
85 |
- |
86 |
-DESCRIPTION="Low Level Virtual Machine" |
87 |
-HOMEPAGE="https://llvm.org/" |
88 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz |
89 |
- https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 |
90 |
- !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )" |
91 |
- |
92 |
-# Keep in sync with CMakeLists.txt |
93 |
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 |
94 |
- NVPTX PowerPC Sparc SystemZ X86 XCore ) |
95 |
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) |
96 |
- |
97 |
-# Additional licenses: |
98 |
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
99 |
-# 2. ARM backend: LLVM Software Grant by ARM. |
100 |
-# 3. MD5 code: public-domain. |
101 |
-# 4. Tests (not installed): |
102 |
-# a. gtest: BSD. |
103 |
-# b. YAML tests: MIT. |
104 |
- |
105 |
-LICENSE="UoI-NCSA rc BSD public-domain |
106 |
- llvm_targets_ARM? ( LLVM-Grant )" |
107 |
-SLOT="$(ver_cut 1)" |
108 |
-KEYWORDS="amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" |
109 |
-IUSE="debug doc gold libedit +libffi ncurses test |
110 |
- kernel_Darwin kernel_linux ${ALL_LLVM_TARGETS[*]}" |
111 |
- |
112 |
-RDEPEND=" |
113 |
- sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
114 |
- gold? ( |
115 |
- || ( |
116 |
- >=sys-devel/binutils-2.31.1-r4:*[plugins] |
117 |
- <sys-devel/binutils-2.31.1-r4:*[cxx] |
118 |
- ) |
119 |
- ) |
120 |
- libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) |
121 |
- libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) |
122 |
- ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )" |
123 |
-# configparser-3.2 breaks the build (3.3 or none at all are fine) |
124 |
-DEPEND="${RDEPEND} |
125 |
- dev-lang/perl |
126 |
- || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5 |
127 |
- ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) |
128 |
- ) |
129 |
- kernel_Darwin? ( |
130 |
- <sys-libs/libcxx-$(ver_cut 1-3).9999 |
131 |
- >=sys-devel/binutils-apple-5.1 |
132 |
- ) |
133 |
- doc? ( dev-python/sphinx ) |
134 |
- gold? ( sys-libs/binutils-libs ) |
135 |
- libffi? ( virtual/pkgconfig ) |
136 |
- !!<dev-python/configparser-3.3.0.2 |
137 |
- ${PYTHON_DEPS}" |
138 |
-# There are no file collisions between these versions but having :0 |
139 |
-# installed means llvm-config there will take precedence. |
140 |
-RDEPEND="${RDEPEND} |
141 |
- !sys-devel/llvm:0" |
142 |
-PDEPEND="sys-devel/llvm-common |
143 |
- gold? ( >=sys-devel/llvmgold-${SLOT} )" |
144 |
- |
145 |
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )" |
146 |
- |
147 |
-S=${WORKDIR}/${P/_/}.src |
148 |
- |
149 |
-# least intrusive of all |
150 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
151 |
- |
152 |
-src_prepare() { |
153 |
- # Fix llvm-config for shared linking and sane flags |
154 |
- # https://bugs.gentoo.org/show_bug.cgi?id=565358 |
155 |
- eapply "${FILESDIR}"/7.1.0/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch |
156 |
- |
157 |
- # Apply the backported patches |
158 |
- eapply "${WORKDIR}/llvm-5.0.1-patchset" |
159 |
- # Copy the new binary file (we don't support git binary patches) |
160 |
- cp {"${WORKDIR}/llvm-5.0.1-patchset",.}/test/tools/llvm-symbolizer/Inputs/print_context.o || die |
161 |
- |
162 |
- # Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD). |
163 |
- eapply "${FILESDIR}"/6.0.1/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch |
164 |
- |
165 |
- # gcc-8 build failure |
166 |
- eapply "${FILESDIR}"/5.0.2/0001-Fix-return-type-in-ORC-readMem-client-interface.patch |
167 |
- |
168 |
- # disable use of SDK on OSX, bug #568758 |
169 |
- sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
170 |
- |
171 |
- # User patches + QA |
172 |
- cmake-utils_src_prepare |
173 |
-} |
174 |
- |
175 |
-multilib_src_configure() { |
176 |
- local ffi_cflags ffi_ldflags |
177 |
- if use libffi; then |
178 |
- ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) |
179 |
- ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) |
180 |
- fi |
181 |
- |
182 |
- local libdir=$(get_libdir) |
183 |
- local mycmakeargs=( |
184 |
- # disable appending VCS revision to the version to improve |
185 |
- # direct cache hit ratio |
186 |
- -DLLVM_APPEND_VC_REV=OFF |
187 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" |
188 |
- -DLLVM_LIBDIR_SUFFIX=${libdir#lib} |
189 |
- |
190 |
- -DBUILD_SHARED_LIBS=ON |
191 |
- -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" |
192 |
- -DLLVM_BUILD_TESTS=$(usex test) |
193 |
- |
194 |
- -DLLVM_ENABLE_FFI=$(usex libffi) |
195 |
- -DLLVM_ENABLE_LIBEDIT=$(usex libedit) |
196 |
- -DLLVM_ENABLE_TERMINFO=$(usex ncurses) |
197 |
- -DLLVM_ENABLE_ASSERTIONS=$(usex debug) |
198 |
- -DLLVM_ENABLE_EH=ON |
199 |
- -DLLVM_ENABLE_RTTI=ON |
200 |
- |
201 |
- -DWITH_POLLY=OFF # TODO |
202 |
- |
203 |
- -DLLVM_HOST_TRIPLE="${CHOST}" |
204 |
- |
205 |
- -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" |
206 |
- -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" |
207 |
- -DHAVE_LIBXAR=0 |
208 |
- |
209 |
- # disable OCaml bindings (now in dev-ml/llvm-ocaml) |
210 |
- -DOCAMLFIND=NO |
211 |
- ) |
212 |
- |
213 |
-# Note: go bindings have no CMake rules at the moment |
214 |
-# but let's kill the check in case they are introduced |
215 |
-# if ! multilib_is_native_abi || ! use go; then |
216 |
- mycmakeargs+=( |
217 |
- -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND |
218 |
- ) |
219 |
-# fi |
220 |
- |
221 |
- if multilib_is_native_abi; then |
222 |
- mycmakeargs+=( |
223 |
- -DLLVM_BUILD_DOCS=$(usex doc) |
224 |
- -DLLVM_ENABLE_OCAMLDOC=OFF |
225 |
- -DLLVM_ENABLE_SPHINX=$(usex doc) |
226 |
- -DLLVM_ENABLE_DOXYGEN=OFF |
227 |
- -DLLVM_INSTALL_UTILS=ON |
228 |
- ) |
229 |
- use doc && mycmakeargs+=( |
230 |
- -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" |
231 |
- -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
232 |
- -DSPHINX_WARNINGS_AS_ERRORS=OFF |
233 |
- ) |
234 |
- use gold && mycmakeargs+=( |
235 |
- -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include |
236 |
- ) |
237 |
- fi |
238 |
- |
239 |
- if tc-is-cross-compiler; then |
240 |
- local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" |
241 |
- [[ -x "${tblgen}" ]] \ |
242 |
- || die "${tblgen} not found or usable" |
243 |
- mycmakeargs+=( |
244 |
- -DCMAKE_CROSSCOMPILING=ON |
245 |
- -DLLVM_TABLEGEN="${tblgen}" |
246 |
- ) |
247 |
- fi |
248 |
- |
249 |
- # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 |
250 |
- use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" |
251 |
- cmake-utils_src_configure |
252 |
-} |
253 |
- |
254 |
-multilib_src_compile() { |
255 |
- cmake-utils_src_compile |
256 |
- |
257 |
- pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld |
258 |
- pax-mark m "${BUILD_DIR}"/bin/lli |
259 |
- pax-mark m "${BUILD_DIR}"/bin/lli-child-target |
260 |
- |
261 |
- if use test; then |
262 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests |
263 |
- pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests |
264 |
- pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests |
265 |
- fi |
266 |
-} |
267 |
- |
268 |
-multilib_src_test() { |
269 |
- # respect TMPDIR! |
270 |
- local -x LIT_PRESERVES_TMP=1 |
271 |
- cmake-utils_src_make check |
272 |
-} |
273 |
- |
274 |
-src_install() { |
275 |
- local MULTILIB_CHOST_TOOLS=( |
276 |
- /usr/lib/llvm/${SLOT}/bin/llvm-config |
277 |
- ) |
278 |
- |
279 |
- local MULTILIB_WRAPPED_HEADERS=( |
280 |
- /usr/include/llvm/Config/llvm-config.h |
281 |
- ) |
282 |
- |
283 |
- local LLVM_LDPATHS=() |
284 |
- multilib-minimal_src_install |
285 |
- |
286 |
- # move wrapped headers back |
287 |
- mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die |
288 |
-} |
289 |
- |
290 |
-multilib_src_install() { |
291 |
- cmake-utils_src_install |
292 |
- |
293 |
- # move headers to /usr/include for wrapping |
294 |
- rm -rf "${ED%/}"/usr/include || die |
295 |
- mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die |
296 |
- |
297 |
- if use kernel_linux || use kernel_Darwin; then |
298 |
- # install fuzzer libraries for clang (cmake rules were added in 6) |
299 |
- # https://bugs.gentoo.org/636840 |
300 |
- into "/usr/lib/llvm/${SLOT}" |
301 |
- dolib.a "$(get_libdir)"/libLLVMFuzzer*.a |
302 |
- fi |
303 |
- |
304 |
- LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) |
305 |
-} |
306 |
- |
307 |
-multilib_src_install_all() { |
308 |
- local revord=$(( 9999 - ${SLOT} )) |
309 |
- cat <<-_EOF_ > "${T}/10llvm-${revord}" || die |
310 |
- PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
311 |
- # we need to duplicate it in ROOTPATH for Portage to respect... |
312 |
- ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" |
313 |
- MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" |
314 |
- LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" |
315 |
-_EOF_ |
316 |
- doenvd "${T}/10llvm-${revord}" |
317 |
- |
318 |
- # install pre-generated manpages |
319 |
- if ! use doc; then |
320 |
- # (doman does not support custom paths) |
321 |
- insinto "/usr/lib/llvm/${SLOT}/share/man/man1" |
322 |
- doins "${WORKDIR}/${P}-manpages/llvm"/*.1 |
323 |
- fi |
324 |
- |
325 |
- docompress "/usr/lib/llvm/${SLOT}/share/man" |
326 |
-} |
327 |
- |
328 |
-pkg_postinst() { |
329 |
- elog "You can find additional opt-viewer utility scripts in:" |
330 |
- elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" |
331 |
- elog "To use these scripts, you will need Python 2.7 along with the following" |
332 |
- elog "packages:" |
333 |
- elog " dev-python/pygments (for opt-viewer)" |
334 |
- elog " dev-python/pyyaml (for all of them)" |
335 |
-} |