1 |
commit: 38f052c30a8230d5a1afbc9a70bfb41606c81a6a |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 3 08:58:42 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 3 10:27:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38f052c3 |
7 |
|
8 |
sys-devel/llvm: Move 3.4.2 patchset to tarball |
9 |
|
10 |
sys-devel/llvm/Manifest | 1 + |
11 |
.../llvm/files/3.4.2/clang/darwin_build_fix.patch | 47 ----------- |
12 |
.../llvm/files/3.4.2/clang/gentoo-install.patch | 80 ------------------ |
13 |
.../clang/gentoo-runtime-gcc-detection-v3.patch | 29 ------- |
14 |
sys-devel/llvm/files/3.4.2/gentoo-install.patch | 96 ---------------------- |
15 |
sys-devel/llvm/llvm-3.4.2-r100.ebuild | 15 ++-- |
16 |
6 files changed, 9 insertions(+), 259 deletions(-) |
17 |
|
18 |
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest |
19 |
index 264b6063ef7..ea4cd6bdd9d 100644 |
20 |
--- a/sys-devel/llvm/Manifest |
21 |
+++ b/sys-devel/llvm/Manifest |
22 |
@@ -17,6 +17,7 @@ DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453 |
23 |
DIST lldb-3.8.1.src.tar.xz 10928220 SHA256 349148116a47e39dcb5d5042f10d8a6357d2c865034563283ca512f81cdce8a3 SHA512 d73c55daed6ef5e5ca784c7010f2d75be26024b14fa61a2861a8a6cbe129e417fb7be2a3b532e17e9d7de98ae38ce6a689d8166049eff365fb04f4bd772758f3 WHIRLPOOL 78dd8161cd1411bd62cb3ffe1196fe95ccb73d78f2e141a58c63776eb6d91065fe1348b1b8e241630cdf954ab659b333ebbcdcaeba3e6df36af62aaf3a7c6634 |
24 |
DIST lldb-3.9.1.src.tar.xz 13750816 SHA256 7e3311b2a1f80f4d3426e09f9459d079cab4d698258667e50a46dccbaaa460fc SHA512 e2957a1da60284595b21c205b07fa3db5c474bfad1935ab8e1bc832f30af497e9eb709efeb703591ef62e7dd73a28d22fc21398097a232c8a729946d72eb5df7 WHIRLPOOL ef4903cca78c6509602c72f37738326f0f0544275f068571d9bcfd1e26eb5fb4f78f5f41790a2696e045ac9d6f45adfdb7edd532ac41fd82565b50a6db93725e |
25 |
DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e81303e2c5756ff8bc221e05b46f7e1cb SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d WHIRLPOOL 1c037a9972442937f84bc3147d77d4bbc6d6c0812c3025f3107c2ee5f6259afab990f6e1bca564237fdca8089e2372df4b7ca45cbdea686fbf891f92d1bfbbe6 |
26 |
+DIST llvm-3.4.2-patchset.tar.gz 4612 SHA256 ec5d12763c0181ae0ff7485b08a69b621a988df278fcb3ae009551d637da824c SHA512 32c7cf229a6a8917f0fc67efa1fb11994945281f6906395cee7e5c51399c8fb4c06f554a03253c8f9073890a7bc7af151a8adfe887ad62f45f1523e6e358f769 WHIRLPOOL 408d1b2e55aa14acd3ae34918d164a53ebc3eddf8e3f8e77deb52acbab9e76bf94365d94c34ad6155d2537739a7fffab1b7f088be7d25ba77dd1796164f77721 |
27 |
DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c |
28 |
DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819 |
29 |
DIST llvm-3.5.2.src.tar.xz 11876128 SHA256 44196156d5749eb4b4224fe471a29cc3984df92570a4a89fa859f7394fc0c575 SHA512 0f6a83cc61a385387e7baf8fb8f0d9f18e3fd00d2d389a3c7e2c3792be7d82ed095506cac52c24e65ae3c1f94456a441d39440feef6125e25ef18447ec9dd406 WHIRLPOOL b41de51907d6d2c2d04a4c498b44f0ed560cc710e6e2d8678f5ef93a9009d140bc7c2406f4b25d5b901fd026689d48edce77a2e435687b489b835156a512e256 |
30 |
|
31 |
diff --git a/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch b/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch |
32 |
deleted file mode 100644 |
33 |
index 113b04bc663..00000000000 |
34 |
--- a/sys-devel/llvm/files/3.4.2/clang/darwin_build_fix.patch |
35 |
+++ /dev/null |
36 |
@@ -1,47 +0,0 @@ |
37 |
-Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get |
38 |
-"unable to interface with target machine" errors while building if we |
39 |
-attempt to. Disable those targets. |
40 |
- |
41 |
-Patch by Reza Jelveh from |
42 |
-https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch |
43 |
- |
44 |
---- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk |
45 |
-+++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk |
46 |
-@@ -27,20 +27,20 @@ UniversalArchs := |
47 |
- # Soft-float version of the runtime. No floating-point instructions will be used |
48 |
- # and the ABI (out of necessity) passes floating values in normal registers: |
49 |
- # non-VFP variant of the AAPCS. |
50 |
--Configs += soft_static |
51 |
--UniversalArchs.soft_static := armv6m armv7m armv7em armv7 |
52 |
-+# Configs += soft_static |
53 |
-+# UniversalArchs.soft_static := armv6m armv7m armv7em armv7 |
54 |
- |
55 |
- # Hard-float version of the runtime. On ARM VFP instructions and registers are |
56 |
- # allowed, and floating point values get passed in them. VFP variant of the |
57 |
- # AAPCS. |
58 |
- Configs += hard_static |
59 |
--UniversalArchs.hard_static := armv7em armv7 i386 x86_64 |
60 |
-+UniversalArchs.hard_static := i386 x86_64 |
61 |
- |
62 |
--Configs += soft_pic |
63 |
--UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 |
64 |
-+# Configs += soft_pic |
65 |
-+# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7 |
66 |
- |
67 |
- Configs += hard_pic |
68 |
--UniversalArchs.hard_pic := armv7em armv7 i386 x86_64 |
69 |
-+UniversalArchs.hard_pic := i386 x86_64 |
70 |
- |
71 |
- CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding |
72 |
- |
73 |
---- a/tools/clang/runtime/compiler-rt/Makefile |
74 |
-+++ b/tools/clang/runtime/compiler-rt/Makefile |
75 |
-@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \ |
76 |
- profile_osx.a profile_ios.a \ |
77 |
- ubsan_osx.a |
78 |
- RuntimeLibrary.darwin_embedded.Configs := \ |
79 |
-- soft_static.a hard_static.a soft_pic.a hard_pic.a |
80 |
-+ hard_static.a hard_pic.a |
81 |
- |
82 |
- # Support building compiler-rt with relocatable SDKs. |
83 |
- # |
84 |
|
85 |
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch |
86 |
deleted file mode 100644 |
87 |
index 0a1d9eb3c35..00000000000 |
88 |
--- a/sys-devel/llvm/files/3.4.2/clang/gentoo-install.patch |
89 |
+++ /dev/null |
90 |
@@ -1,80 +0,0 @@ |
91 |
-From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001 |
92 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
93 |
-Date: Sat, 14 Jun 2014 19:35:33 +0200 |
94 |
-Subject: [PATCH] clang gentoo fixes |
95 |
- |
96 |
---- |
97 |
- tools/clang/lib/Driver/Tools.cpp | 6 +++--- |
98 |
- tools/clang/tools/scan-build/scan-build | 4 ++-- |
99 |
- tools/clang/tools/scan-view/scan-view | 2 +- |
100 |
- 3 files changed, 6 insertions(+), 6 deletions(-) |
101 |
- |
102 |
-diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp |
103 |
-index b013eb5..dbbcacb 100644 |
104 |
---- a/tools/clang/lib/Driver/Tools.cpp |
105 |
-+++ b/tools/clang/lib/Driver/Tools.cpp |
106 |
-@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, |
107 |
- // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is |
108 |
- // not supported by old linkers. |
109 |
- std::string ProfileRT = |
110 |
-- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; |
111 |
-+ "-l:libprofile_rt.a"; |
112 |
- |
113 |
- CmdArgs.push_back(Args.MakeArgString(ProfileRT)); |
114 |
- } |
115 |
-@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, |
116 |
- // forward. |
117 |
- if (D.IsUsingLTO(Args)) { |
118 |
- CmdArgs.push_back("-plugin"); |
119 |
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; |
120 |
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; |
121 |
- CmdArgs.push_back(Args.MakeArgString(Plugin)); |
122 |
- |
123 |
- // Try to pass driver level flags relevant to LTO code generation down to |
124 |
-@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, |
125 |
- // forward. |
126 |
- if (D.IsUsingLTO(Args)) { |
127 |
- CmdArgs.push_back("-plugin"); |
128 |
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; |
129 |
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; |
130 |
- CmdArgs.push_back(Args.MakeArgString(Plugin)); |
131 |
- |
132 |
- // Try to pass driver level flags relevant to LTO code generation down to |
133 |
-diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build |
134 |
-index 0f119f6..58f78d9 100755 |
135 |
---- a/tools/clang/tools/scan-build/scan-build |
136 |
-+++ b/tools/clang/tools/scan-build/scan-build |
137 |
-@@ -419,7 +419,7 @@ sub CopyFiles { |
138 |
- |
139 |
- my $Dir = shift; |
140 |
- |
141 |
-- my $JS = Cwd::realpath("$RealBin/sorttable.js"); |
142 |
-+ my $JS = Cwd::realpath("@EPREFIX@/usr/share/llvm/sorttable.js"); |
143 |
- |
144 |
- DieDiag("Cannot find 'sorttable.js'.\n") |
145 |
- if (! -r $JS); |
146 |
-@@ -429,7 +429,7 @@ sub CopyFiles { |
147 |
- DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") |
148 |
- if (! -r "$Dir/sorttable.js"); |
149 |
- |
150 |
-- my $CSS = Cwd::realpath("$RealBin/scanview.css"); |
151 |
-+ my $CSS = Cwd::realpath("@EPREFIX@/usr/share/llvm/scanview.css"); |
152 |
- |
153 |
- DieDiag("Cannot find 'scanview.css'.\n") |
154 |
- if (! -r $CSS); |
155 |
-diff --git a/tools/clang/tools/scan-view/scan-view b/tools/clang/tools/scan-view/scan-view |
156 |
-index fb27da6..1f8ddb8 100755 |
157 |
---- a/tools/clang/tools/scan-view/scan-view |
158 |
-+++ b/tools/clang/tools/scan-view/scan-view |
159 |
-@@ -54,7 +54,7 @@ def start_browser(port, options): |
160 |
- webbrowser.open(url) |
161 |
- |
162 |
- def run(port, options, root): |
163 |
-- import ScanView |
164 |
-+ from clang import ScanView |
165 |
- try: |
166 |
- print 'Starting scan-view at: http://%s:%d'%(options.host, |
167 |
- port) |
168 |
--- |
169 |
-2.0.0 |
170 |
- |
171 |
|
172 |
diff --git a/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch b/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch |
173 |
deleted file mode 100644 |
174 |
index 49f10853340..00000000000 |
175 |
--- a/sys-devel/llvm/files/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch |
176 |
+++ /dev/null |
177 |
@@ -1,29 +0,0 @@ |
178 |
-diff -upNr a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp |
179 |
---- a/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:32:31.593191000 -0400 |
180 |
-+++ b/llvm-3.1.src/tools/clang/lib/Driver/ToolChains.cpp 2012-05-24 03:38:31.733163513 -0400 |
181 |
-@@ -1145,6 +1145,25 @@ Generic_GCC::GCCInstallationDetector::GC |
182 |
- Prefixes.push_back(D.InstalledDir + "/.."); |
183 |
- } |
184 |
- |
185 |
-+ llvm::OwningPtr<llvm::MemoryBuffer> File; |
186 |
-+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { |
187 |
-+ if (!llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str(), File)) |
188 |
-+ { |
189 |
-+ bool Exists; |
190 |
-+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); |
191 |
-+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; |
192 |
-+ if (!llvm::sys::fs::exists(GentooPath + "/crtbegin.o", Exists) && Exists) |
193 |
-+ { |
194 |
-+ Version = GCCVersion::Parse(VersionText); |
195 |
-+ GCCInstallPath = GentooPath; |
196 |
-+ GCCParentLibPath = GCCInstallPath + "/../../.."; |
197 |
-+ GCCTriple.setTriple(CandidateTripleAliases[k]); |
198 |
-+ IsValid = true; |
199 |
-+ return; |
200 |
-+ } |
201 |
-+ } |
202 |
-+ } |
203 |
-+ |
204 |
- // Loop over the various components which exist and select the best GCC |
205 |
- // installation available. GCC installs are ranked by version number. |
206 |
- Version = GCCVersion::Parse("0.0.0"); |
207 |
|
208 |
diff --git a/sys-devel/llvm/files/3.4.2/gentoo-install.patch b/sys-devel/llvm/files/3.4.2/gentoo-install.patch |
209 |
deleted file mode 100644 |
210 |
index a2ba7dee47e..00000000000 |
211 |
--- a/sys-devel/llvm/files/3.4.2/gentoo-install.patch |
212 |
+++ /dev/null |
213 |
@@ -1,96 +0,0 @@ |
214 |
-From b8846d389ff5e2b768a114f752cf39788accba26 Mon Sep 17 00:00:00 2001 |
215 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
216 |
-Date: Mon, 19 Aug 2013 13:22:46 +0200 |
217 |
-Subject: [PATCH] gentoo install fixes |
218 |
- |
219 |
---- |
220 |
- Makefile.config.in | 6 +++--- |
221 |
- Makefile.rules | 6 +++--- |
222 |
- tools/llvm-config/BuildVariables.inc.in | 2 ++ |
223 |
- tools/llvm-config/Makefile | 4 ++++ |
224 |
- tools/llvm-config/llvm-config.cpp | 5 +++-- |
225 |
- utils/FileCheck/Makefile | 2 +- |
226 |
- 7 files changed, 17 insertions(+), 10 deletions(-) |
227 |
- |
228 |
-diff --git a/Makefile.config.in b/Makefile.config.in |
229 |
-index dcca45f..e75ae2e 100644 |
230 |
---- a/Makefile.config.in |
231 |
-+++ b/Makefile.config.in |
232 |
-@@ -95,10 +95,10 @@ PROJ_internal_prefix := $(prefix) |
233 |
- endif |
234 |
- |
235 |
- PROJ_bindir := $(PROJ_prefix)/bin |
236 |
--PROJ_libdir := $(PROJ_prefix)/lib |
237 |
-+PROJ_libdir := $(PROJ_prefix)/$(GENTOO_LIBDIR) |
238 |
- PROJ_datadir := $(PROJ_prefix)/share |
239 |
--PROJ_docsdir := $(PROJ_prefix)/docs/llvm |
240 |
--PROJ_etcdir := $(PROJ_prefix)/etc/llvm |
241 |
-+PROJ_docsdir := $(PROJ_prefix)/share/doc/@PF@ |
242 |
-+PROJ_etcdir := @EPREFIX@/etc/llvm |
243 |
- PROJ_includedir := $(PROJ_prefix)/include |
244 |
- PROJ_infodir := $(PROJ_prefix)/info |
245 |
- PROJ_mandir := $(PROJ_prefix)/share/man |
246 |
-diff --git a/Makefile.rules b/Makefile.rules |
247 |
-index e53598b..217f754 100644 |
248 |
---- a/Makefile.rules |
249 |
-+++ b/Makefile.rules |
250 |
-@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1) |
251 |
- BuildMode := Release |
252 |
- # Don't use -fomit-frame-pointer on Darwin or FreeBSD. |
253 |
- ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin DragonFly FreeBSD GNU/kFreeBSD)) |
254 |
-- OmitFramePointer := -fomit-frame-pointer |
255 |
-+ OmitFramePointer := |
256 |
- endif |
257 |
- |
258 |
- CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer) |
259 |
-diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in |
260 |
-index fe87afb..fd9f2c6 100644 |
261 |
---- a/tools/llvm-config/BuildVariables.inc.in |
262 |
-+++ b/tools/llvm-config/BuildVariables.inc.in |
263 |
-@@ -25,3 +25,4 @@ |
264 |
- #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" |
265 |
- #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" |
266 |
- #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" |
267 |
-+#define LLVM_LIBDIR "@LLVM_LIBDIR@" |
268 |
-diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile |
269 |
-index b20b6bf..fc56781 100644 |
270 |
---- a/tools/llvm-config/Makefile |
271 |
-+++ b/tools/llvm-config/Makefile |
272 |
-@@ -55,6 +55,8 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir |
273 |
- >> temp.sed |
274 |
- $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \ |
275 |
- >> temp.sed |
276 |
-+ $(Verb) $(ECHO) 's/@LLVM_LIBDIR@/$(subst /,\/,$(GENTOO_LIBDIR))/' \ |
277 |
-+ >> temp.sed |
278 |
- $(Verb) $(SED) -f temp.sed < $< > $@ |
279 |
- $(Verb) $(RM) temp.sed |
280 |
- |
281 |
-diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp |
282 |
-index 3924e2e..f439c60 100644 |
283 |
---- a/tools/llvm-config/llvm-config.cpp |
284 |
-+++ b/tools/llvm-config/llvm-config.cpp |
285 |
-@@ -250,7 +250,7 @@ int main(int argc, char **argv) { |
286 |
- ActivePrefix = CurrentExecPrefix; |
287 |
- ActiveIncludeDir = ActivePrefix + "/include"; |
288 |
- ActiveBinDir = ActivePrefix + "/bin"; |
289 |
-- ActiveLibDir = ActivePrefix + "/lib"; |
290 |
-+ ActiveLibDir = ActivePrefix + "/" LLVM_LIBDIR; |
291 |
- ActiveIncludeOption = "-I" + ActiveIncludeDir; |
292 |
- } |
293 |
- |
294 |
-diff --git a/utils/FileCheck/Makefile b/utils/FileCheck/Makefile |
295 |
-index 268b7bc..e7674f9 100644 |
296 |
---- a/utils/FileCheck/Makefile |
297 |
-+++ b/utils/FileCheck/Makefile |
298 |
-@@ -15,7 +15,7 @@ USEDLIBS = LLVMSupport.a |
299 |
- TOOL_NO_EXPORTS = 1 |
300 |
- |
301 |
- # Don't install this utility |
302 |
--NO_INSTALL = 1 |
303 |
-+#NO_INSTALL = 1 |
304 |
- |
305 |
- include $(LEVEL)/Makefile.common |
306 |
- |
307 |
--- |
308 |
-1.8.4.2 |
309 |
- |
310 |
|
311 |
diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
312 |
index 30d4081c1af..d03486db7d7 100644 |
313 |
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
314 |
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild |
315 |
@@ -12,7 +12,8 @@ HOMEPAGE="http://llvm.org/" |
316 |
SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz |
317 |
clang? ( http://llvm.org/releases/3.4/compiler-rt-3.4.src.tar.gz |
318 |
http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz ) |
319 |
- https://dev.gentoo.org/~mgorny/dist/${PN}-3.4-manpages.tar.bz2" |
320 |
+ https://dev.gentoo.org/~mgorny/dist/llvm/${PN}-3.4-manpages.tar.bz2 |
321 |
+ https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz" |
322 |
|
323 |
# Additional licenses: |
324 |
# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. |
325 |
@@ -96,16 +97,16 @@ src_unpack() { |
326 |
} |
327 |
|
328 |
src_prepare() { |
329 |
- epatch "${FILESDIR}"/3.6.2/nodoctargz.patch |
330 |
- epatch "${FILESDIR}"/3.4.2/gentoo-install.patch |
331 |
+ epatch "${WORKDIR}/${P}-patchset"/nodoctargz.patch |
332 |
+ epatch "${WORKDIR}/${P}-patchset"/gentoo-install.patch |
333 |
|
334 |
if use clang; then |
335 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
336 |
- epatch "${FILESDIR}"/3.4.2/clang/gentoo-runtime-gcc-detection-v3.patch |
337 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch |
338 |
|
339 |
- epatch "${FILESDIR}"/3.4.2/clang/gentoo-install.patch |
340 |
- epatch "${FILESDIR}"/3.4.2/clang/darwin_build_fix.patch |
341 |
- epatch "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch |
342 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch |
343 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/darwin_build_fix.patch |
344 |
+ epatch "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch |
345 |
eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp |
346 |
fi |