1 |
commit: 9ca3a8be770285335ab3e2ef9b253a28f9909d41 |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 27 01:21:02 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 07:17:44 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca3a8be |
7 |
|
8 |
sys-devel/llvm: fix git-format-clang shebang, #562688 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/562688 |
11 |
Package-Manager: portage-2.2.28 |
12 |
Pull-Request: https://github.com/gentoo/gentoo/pull/1766 |
13 |
|
14 |
sys-devel/llvm/{llvm-3.7.1-r2.ebuild => llvm-3.7.1-r3.ebuild} | 7 +++++-- |
15 |
sys-devel/llvm/{llvm-3.8.0-r2.ebuild => llvm-3.8.0-r3.ebuild} | 7 +++++-- |
16 |
sys-devel/llvm/llvm-9999.ebuild | 6 ++++-- |
17 |
3 files changed, 14 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/sys-devel/llvm/llvm-3.7.1-r2.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
20 |
similarity index 99% |
21 |
rename from sys-devel/llvm/llvm-3.7.1-r2.ebuild |
22 |
rename to sys-devel/llvm/llvm-3.7.1-r3.ebuild |
23 |
index 65f2fc7..a76fae7 100644 |
24 |
--- a/sys-devel/llvm/llvm-3.7.1-r2.ebuild |
25 |
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild |
26 |
@@ -136,6 +136,8 @@ src_unpack() { |
27 |
} |
28 |
|
29 |
src_prepare() { |
30 |
+ python_setup |
31 |
+ |
32 |
# Make ocaml warnings non-fatal, bug #537308 |
33 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
34 |
# Fix libdir for ocaml bindings install, bug #559134 |
35 |
@@ -204,6 +206,9 @@ src_prepare() { |
36 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
37 |
eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
38 |
|
39 |
+ # Fix git-clang-format shebang, bug #562688 |
40 |
+ python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
41 |
+ |
42 |
pushd projects/compiler-rt >/dev/null || die |
43 |
|
44 |
# Fix msan with newer kernels, compiler-rt part, #569894 |
45 |
@@ -236,8 +241,6 @@ src_prepare() { |
46 |
# User patches |
47 |
eapply_user |
48 |
|
49 |
- python_setup |
50 |
- |
51 |
# Native libdir is used to hold LLVMgold.so |
52 |
NATIVE_LIBDIR=$(get_libdir) |
53 |
} |
54 |
|
55 |
diff --git a/sys-devel/llvm/llvm-3.8.0-r2.ebuild b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
56 |
similarity index 99% |
57 |
rename from sys-devel/llvm/llvm-3.8.0-r2.ebuild |
58 |
rename to sys-devel/llvm/llvm-3.8.0-r3.ebuild |
59 |
index 2a11830..bc84e8f 100644 |
60 |
--- a/sys-devel/llvm/llvm-3.8.0-r2.ebuild |
61 |
+++ b/sys-devel/llvm/llvm-3.8.0-r3.ebuild |
62 |
@@ -137,6 +137,8 @@ src_unpack() { |
63 |
} |
64 |
|
65 |
src_prepare() { |
66 |
+ python_setup |
67 |
+ |
68 |
# Make ocaml warnings non-fatal, bug #537308 |
69 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
70 |
# Fix libdir for ocaml bindings install, bug #559134 |
71 |
@@ -201,6 +203,9 @@ src_prepare() { |
72 |
# https://llvm.org/bugs/show_bug.cgi?id=23793 |
73 |
eapply "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch |
74 |
|
75 |
+ # Fix git-clang-format shebang, bug #562688 |
76 |
+ python_fix_shebang tools/clang/tools/clang-format/git-clang-format |
77 |
+ |
78 |
# Fix 'stdarg.h' file not found on Gentoo/FreeBSD, bug #578064 |
79 |
# https://llvm.org/bugs/show_bug.cgi?id=26651 |
80 |
eapply "${FILESDIR}"/clang-3.8-compiler-rt-fbsd.patch |
81 |
@@ -227,8 +232,6 @@ src_prepare() { |
82 |
# User patches |
83 |
eapply_user |
84 |
|
85 |
- python_setup |
86 |
- |
87 |
# Native libdir is used to hold LLVMgold.so |
88 |
NATIVE_LIBDIR=$(get_libdir) |
89 |
} |
90 |
|
91 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
92 |
index 8d290ba..148ed8a 100644 |
93 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
94 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
95 |
@@ -107,6 +107,8 @@ pkg_pretend() { |
96 |
|
97 |
pkg_setup() { |
98 |
pkg_pretend |
99 |
+ |
100 |
+ python-single-r1_pkg_setup |
101 |
} |
102 |
|
103 |
src_unpack() { |
104 |
@@ -140,6 +142,8 @@ src_unpack() { |
105 |
} |
106 |
|
107 |
src_prepare() { |
108 |
+ python_setup |
109 |
+ |
110 |
# Make ocaml warnings non-fatal, bug #537308 |
111 |
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die |
112 |
# Fix libdir for ocaml bindings install, bug #559134 |
113 |
@@ -203,8 +207,6 @@ src_prepare() { |
114 |
# User patches |
115 |
eapply_user |
116 |
|
117 |
- python_setup |
118 |
- |
119 |
# Native libdir is used to hold LLVMgold.so |
120 |
NATIVE_LIBDIR=$(get_libdir) |
121 |
} |