1 |
commit: f988bded979ed49ed3b5141e6c9a10f07f86c600 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 17 21:59:09 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 17 22:05:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f988bded |
7 |
|
8 |
sys-devel/llvm: Bump the live ebuild to EAPI 6 |
9 |
|
10 |
sys-devel/llvm/llvm-9999.ebuild | 26 +++++++++++++------------- |
11 |
1 file changed, 13 insertions(+), 13 deletions(-) |
12 |
|
13 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
14 |
index 97ed7fd..14c5da5 100644 |
15 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
16 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
17 |
@@ -2,7 +2,7 @@ |
18 |
# Distributed under the terms of the GNU General Public License v2 |
19 |
# $Id$ |
20 |
|
21 |
-EAPI=5 |
22 |
+EAPI=6 |
23 |
|
24 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
25 |
PYTHON_COMPAT=( python2_7 ) |
26 |
@@ -142,45 +142,45 @@ src_prepare() { |
27 |
# Make ocaml warnings non-fatal, bug #537308 |
28 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
29 |
# Fix libdir for ocaml bindings install, bug #559134 |
30 |
- epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
31 |
+ eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch |
32 |
# Do not build/install ocaml docs with USE=-doc, bug #562008 |
33 |
- epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
34 |
+ eapply "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch |
35 |
|
36 |
# Make it possible to override Sphinx HTML install dirs |
37 |
# https://llvm.org/bugs/show_bug.cgi?id=23780 |
38 |
- epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
39 |
+ eapply "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch |
40 |
|
41 |
# Prevent race conditions with parallel Sphinx runs |
42 |
# https://llvm.org/bugs/show_bug.cgi?id=23781 |
43 |
- epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
44 |
+ eapply "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch |
45 |
|
46 |
# Prevent installing libgtest |
47 |
# https://llvm.org/bugs/show_bug.cgi?id=18341 |
48 |
- epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
49 |
+ eapply "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch |
50 |
|
51 |
# Allow custom cmake build types (like 'Gentoo') |
52 |
- epatch "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
53 |
+ eapply "${FILESDIR}"/cmake/${PN}-3.8-allow_custom_cmake_build_types.patch |
54 |
|
55 |
# Fix llvm-config for shared linking and sane flags |
56 |
# https://bugs.gentoo.org/show_bug.cgi?id=565358 |
57 |
- epatch "${FILESDIR}"/llvm-3.9-llvm-config.patch |
58 |
+ eapply "${FILESDIR}"/llvm-3.9-llvm-config.patch |
59 |
|
60 |
# disable use of SDK on OSX, bug #568758 |
61 |
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die |
62 |
|
63 |
if use clang; then |
64 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
65 |
- epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
66 |
+ eapply "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
67 |
|
68 |
# Install clang runtime into /usr/lib/clang |
69 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
70 |
- epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
71 |
- epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
72 |
+ eapply "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
73 |
+ eapply "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch |
74 |
|
75 |
# Make it possible to override CLANG_LIBDIR_SUFFIX |
76 |
# (that is used only to find LLVMgold.so) |
77 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
78 |
- epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
79 |
+ eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
80 |
|
81 |
# Fix WX sections, bug #421527 |
82 |
find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \ |
83 |
@@ -196,7 +196,7 @@ src_prepare() { |
84 |
fi |
85 |
|
86 |
# User patches |
87 |
- epatch_user |
88 |
+ eapply_user |
89 |
|
90 |
python_setup |