1 |
commit: c955b7aaea1f5fcb401424c50561bd2ddb8ebc07 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 3 18:40:41 2015 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 3 18:40:52 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c955b7aa |
7 |
|
8 |
dev-libs/openssl: Added new parallel build patch for 1.0.2e version. |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
.../files/openssl-1.0.2e-parallel-build.patch | 314 +++++++++++++++++++++ |
14 |
dev-libs/openssl/openssl-1.0.2e.ebuild | 2 +- |
15 |
2 files changed, 315 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch |
18 |
new file mode 100644 |
19 |
index 0000000..53d4baa |
20 |
--- /dev/null |
21 |
+++ b/dev-libs/openssl/files/openssl-1.0.2e-parallel-build.patch |
22 |
@@ -0,0 +1,314 @@ |
23 |
+--- openssl-1.0.2e/crypto/Makefile |
24 |
++++ openssl-1.0.2e/crypto/Makefile |
25 |
+@@ -85,11 +85,11 @@ |
26 |
+ @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi |
27 |
+ |
28 |
+ subdirs: |
29 |
+- @target=all; $(RECURSIVE_MAKE) |
30 |
++ +@target=all; $(RECURSIVE_MAKE) |
31 |
+ |
32 |
+ files: |
33 |
+ $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO |
34 |
+- @target=files; $(RECURSIVE_MAKE) |
35 |
++ +@target=files; $(RECURSIVE_MAKE) |
36 |
+ |
37 |
+ links: |
38 |
+ @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) |
39 |
+@@ -100,7 +100,7 @@ |
40 |
+ # lib: $(LIB): are splitted to avoid end-less loop |
41 |
+ lib: $(LIB) |
42 |
+ @touch lib |
43 |
+-$(LIB): $(LIBOBJ) |
44 |
++$(LIB): $(LIBOBJ) | subdirs |
45 |
+ $(AR) $(LIB) $(LIBOBJ) |
46 |
+ test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o |
47 |
+ $(RANLIB) $(LIB) || echo Never mind. |
48 |
+@@ -111,7 +111,7 @@ |
49 |
+ fi |
50 |
+ |
51 |
+ libs: |
52 |
+- @target=lib; $(RECURSIVE_MAKE) |
53 |
++ +@target=lib; $(RECURSIVE_MAKE) |
54 |
+ |
55 |
+ install: |
56 |
+ @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
57 |
+@@ -120,7 +120,7 @@ |
58 |
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
59 |
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
60 |
+ done; |
61 |
+- @target=install; $(RECURSIVE_MAKE) |
62 |
++ +@target=install; $(RECURSIVE_MAKE) |
63 |
+ |
64 |
+ lint: |
65 |
+ @target=lint; $(RECURSIVE_MAKE) |
66 |
+--- openssl-1.0.2e/engines/Makefile |
67 |
++++ openssl-1.0.2e/engines/Makefile |
68 |
+@@ -72,7 +72,7 @@ |
69 |
+ |
70 |
+ all: lib subdirs |
71 |
+ |
72 |
+-lib: $(LIBOBJ) |
73 |
++lib: $(LIBOBJ) | subdirs |
74 |
+ @if [ -n "$(SHARED_LIBS)" ]; then \ |
75 |
+ set -e; \ |
76 |
+ for l in $(LIBNAMES); do \ |
77 |
+@@ -89,7 +89,7 @@ |
78 |
+ |
79 |
+ subdirs: |
80 |
+ echo $(EDIRS) |
81 |
+- @target=all; $(RECURSIVE_MAKE) |
82 |
++ +@target=all; $(RECURSIVE_MAKE) |
83 |
+ |
84 |
+ files: |
85 |
+ $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
86 |
+@@ -128,7 +128,7 @@ |
87 |
+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
88 |
+ done; \ |
89 |
+ fi |
90 |
+- @target=install; $(RECURSIVE_MAKE) |
91 |
++ +@target=install; $(RECURSIVE_MAKE) |
92 |
+ |
93 |
+ tags: |
94 |
+ ctags $(SRC) |
95 |
+--- openssl-1.0.2e/Makefile.org |
96 |
++++ openssl-1.0.2e/Makefile.org |
97 |
+@@ -280,17 +280,17 @@ |
98 |
+ build_libssl: build_ssl libssl.pc |
99 |
+ |
100 |
+ build_crypto: |
101 |
+- @dir=crypto; target=all; $(BUILD_ONE_CMD) |
102 |
++ +@dir=crypto; target=all; $(BUILD_ONE_CMD) |
103 |
+ build_ssl: build_crypto |
104 |
+- @dir=ssl; target=all; $(BUILD_ONE_CMD) |
105 |
++ +@dir=ssl; target=all; $(BUILD_ONE_CMD) |
106 |
+ build_engines: build_crypto |
107 |
+- @dir=engines; target=all; $(BUILD_ONE_CMD) |
108 |
++ +@dir=engines; target=all; $(BUILD_ONE_CMD) |
109 |
+ build_apps: build_libs |
110 |
+- @dir=apps; target=all; $(BUILD_ONE_CMD) |
111 |
++ +@dir=apps; target=all; $(BUILD_ONE_CMD) |
112 |
+ build_tests: build_libs |
113 |
+- @dir=test; target=all; $(BUILD_ONE_CMD) |
114 |
++ +@dir=test; target=all; $(BUILD_ONE_CMD) |
115 |
+ build_tools: build_libs |
116 |
+- @dir=tools; target=all; $(BUILD_ONE_CMD) |
117 |
++ +@dir=tools; target=all; $(BUILD_ONE_CMD) |
118 |
+ |
119 |
+ all_testapps: build_libs build_testapps |
120 |
+ build_testapps: |
121 |
+@@ -548,7 +548,7 @@ |
122 |
+ (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
123 |
+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
124 |
+ done; |
125 |
+- @set -e; target=install; $(RECURSIVE_BUILD_CMD) |
126 |
++ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) |
127 |
+ @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ |
128 |
+ do \ |
129 |
+ if [ -f "$$i" ]; then \ |
130 |
+--- openssl-1.0.2e/Makefile.shared |
131 |
++++ openssl-1.0.2e/Makefile.shared |
132 |
+@@ -105,6 +105,7 @@ |
133 |
+ SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ |
134 |
+ LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ |
135 |
+ LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ |
136 |
++ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ |
137 |
+ LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ |
138 |
+ $${SHAREDCMD} $${SHAREDFLAGS} \ |
139 |
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ |
140 |
+@@ -122,6 +123,7 @@ |
141 |
+ done; \ |
142 |
+ fi; \ |
143 |
+ if [ -n "$$SHLIB_SOVER" ]; then \ |
144 |
++ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ |
145 |
+ ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ |
146 |
+ ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ |
147 |
+ fi; \ |
148 |
+--- openssl-1.0.2e/test/Makefile |
149 |
++++ openssl-1.0.2e/test/Makefile |
150 |
+@@ -138,7 +138,7 @@ |
151 |
+ tags: |
152 |
+ ctags $(SRC) |
153 |
+ |
154 |
+-tests: exe apps $(TESTS) |
155 |
++tests: exe $(TESTS) |
156 |
+ |
157 |
+ apps: |
158 |
+ @(cd ..; $(MAKE) DIRS=apps all) |
159 |
+@@ -416,127 +416,127 @@ |
160 |
+ link_app.$${shlib_target} |
161 |
+ |
162 |
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) |
163 |
+- @target=$(RSATEST); $(BUILD_CMD) |
164 |
++ +@target=$(RSATEST); $(BUILD_CMD) |
165 |
+ |
166 |
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) |
167 |
+- @target=$(BNTEST); $(BUILD_CMD) |
168 |
++ +@target=$(BNTEST); $(BUILD_CMD) |
169 |
+ |
170 |
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) |
171 |
+- @target=$(ECTEST); $(BUILD_CMD) |
172 |
++ +@target=$(ECTEST); $(BUILD_CMD) |
173 |
+ |
174 |
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) |
175 |
+- @target=$(EXPTEST); $(BUILD_CMD) |
176 |
++ +@target=$(EXPTEST); $(BUILD_CMD) |
177 |
+ |
178 |
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) |
179 |
+- @target=$(IDEATEST); $(BUILD_CMD) |
180 |
++ +@target=$(IDEATEST); $(BUILD_CMD) |
181 |
+ |
182 |
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) |
183 |
+- @target=$(MD2TEST); $(BUILD_CMD) |
184 |
++ +@target=$(MD2TEST); $(BUILD_CMD) |
185 |
+ |
186 |
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) |
187 |
+- @target=$(SHATEST); $(BUILD_CMD) |
188 |
++ +@target=$(SHATEST); $(BUILD_CMD) |
189 |
+ |
190 |
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) |
191 |
+- @target=$(SHA1TEST); $(BUILD_CMD) |
192 |
++ +@target=$(SHA1TEST); $(BUILD_CMD) |
193 |
+ |
194 |
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) |
195 |
+- @target=$(SHA256TEST); $(BUILD_CMD) |
196 |
++ +@target=$(SHA256TEST); $(BUILD_CMD) |
197 |
+ |
198 |
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) |
199 |
+- @target=$(SHA512TEST); $(BUILD_CMD) |
200 |
++ +@target=$(SHA512TEST); $(BUILD_CMD) |
201 |
+ |
202 |
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) |
203 |
+- @target=$(RMDTEST); $(BUILD_CMD) |
204 |
++ +@target=$(RMDTEST); $(BUILD_CMD) |
205 |
+ |
206 |
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) |
207 |
+- @target=$(MDC2TEST); $(BUILD_CMD) |
208 |
++ +@target=$(MDC2TEST); $(BUILD_CMD) |
209 |
+ |
210 |
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) |
211 |
+- @target=$(MD4TEST); $(BUILD_CMD) |
212 |
++ +@target=$(MD4TEST); $(BUILD_CMD) |
213 |
+ |
214 |
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) |
215 |
+- @target=$(MD5TEST); $(BUILD_CMD) |
216 |
++ +@target=$(MD5TEST); $(BUILD_CMD) |
217 |
+ |
218 |
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) |
219 |
+- @target=$(HMACTEST); $(BUILD_CMD) |
220 |
++ +@target=$(HMACTEST); $(BUILD_CMD) |
221 |
+ |
222 |
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) |
223 |
+- @target=$(WPTEST); $(BUILD_CMD) |
224 |
++ +@target=$(WPTEST); $(BUILD_CMD) |
225 |
+ |
226 |
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) |
227 |
+- @target=$(RC2TEST); $(BUILD_CMD) |
228 |
++ +@target=$(RC2TEST); $(BUILD_CMD) |
229 |
+ |
230 |
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) |
231 |
+- @target=$(BFTEST); $(BUILD_CMD) |
232 |
++ +@target=$(BFTEST); $(BUILD_CMD) |
233 |
+ |
234 |
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) |
235 |
+- @target=$(CASTTEST); $(BUILD_CMD) |
236 |
++ +@target=$(CASTTEST); $(BUILD_CMD) |
237 |
+ |
238 |
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) |
239 |
+- @target=$(RC4TEST); $(BUILD_CMD) |
240 |
++ +@target=$(RC4TEST); $(BUILD_CMD) |
241 |
+ |
242 |
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) |
243 |
+- @target=$(RC5TEST); $(BUILD_CMD) |
244 |
++ +@target=$(RC5TEST); $(BUILD_CMD) |
245 |
+ |
246 |
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) |
247 |
+- @target=$(DESTEST); $(BUILD_CMD) |
248 |
++ +@target=$(DESTEST); $(BUILD_CMD) |
249 |
+ |
250 |
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) |
251 |
+- @target=$(RANDTEST); $(BUILD_CMD) |
252 |
++ +@target=$(RANDTEST); $(BUILD_CMD) |
253 |
+ |
254 |
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) |
255 |
+- @target=$(DHTEST); $(BUILD_CMD) |
256 |
++ +@target=$(DHTEST); $(BUILD_CMD) |
257 |
+ |
258 |
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) |
259 |
+- @target=$(DSATEST); $(BUILD_CMD) |
260 |
++ +@target=$(DSATEST); $(BUILD_CMD) |
261 |
+ |
262 |
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) |
263 |
+- @target=$(METHTEST); $(BUILD_CMD) |
264 |
++ +@target=$(METHTEST); $(BUILD_CMD) |
265 |
+ |
266 |
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) |
267 |
+- @target=$(SSLTEST); $(FIPS_BUILD_CMD) |
268 |
++ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) |
269 |
+ |
270 |
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) |
271 |
+- @target=$(ENGINETEST); $(BUILD_CMD) |
272 |
++ +@target=$(ENGINETEST); $(BUILD_CMD) |
273 |
+ |
274 |
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) |
275 |
+- @target=$(EVPTEST); $(BUILD_CMD) |
276 |
++ +@target=$(EVPTEST); $(BUILD_CMD) |
277 |
+ |
278 |
+ $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO) |
279 |
+- @target=$(EVPEXTRATEST); $(BUILD_CMD) |
280 |
++ +@target=$(EVPEXTRATEST); $(BUILD_CMD) |
281 |
+ |
282 |
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) |
283 |
+- @target=$(ECDSATEST); $(BUILD_CMD) |
284 |
++ +@target=$(ECDSATEST); $(BUILD_CMD) |
285 |
+ |
286 |
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) |
287 |
+- @target=$(ECDHTEST); $(BUILD_CMD) |
288 |
++ +@target=$(ECDHTEST); $(BUILD_CMD) |
289 |
+ |
290 |
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) |
291 |
+- @target=$(IGETEST); $(BUILD_CMD) |
292 |
++ +@target=$(IGETEST); $(BUILD_CMD) |
293 |
+ |
294 |
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) |
295 |
+- @target=$(JPAKETEST); $(BUILD_CMD) |
296 |
++ +@target=$(JPAKETEST); $(BUILD_CMD) |
297 |
+ |
298 |
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) |
299 |
+- @target=$(ASN1TEST); $(BUILD_CMD) |
300 |
++ +@target=$(ASN1TEST); $(BUILD_CMD) |
301 |
+ |
302 |
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) |
303 |
+- @target=$(SRPTEST); $(BUILD_CMD) |
304 |
++ +@target=$(SRPTEST); $(BUILD_CMD) |
305 |
+ |
306 |
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) |
307 |
+- @target=$(V3NAMETEST); $(BUILD_CMD) |
308 |
++ +@target=$(V3NAMETEST); $(BUILD_CMD) |
309 |
+ |
310 |
+ $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) |
311 |
+- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
312 |
++ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) |
313 |
+ |
314 |
+ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o |
315 |
+- @target=$(CONSTTIMETEST) $(BUILD_CMD) |
316 |
++ +@target=$(CONSTTIMETEST) $(BUILD_CMD) |
317 |
+ |
318 |
+ $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o |
319 |
+- @target=$(VERIFYEXTRATEST) $(BUILD_CMD) |
320 |
++ +@target=$(VERIFYEXTRATEST) $(BUILD_CMD) |
321 |
+ |
322 |
+ $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o |
323 |
+- @target=$(CLIENTHELLOTEST) $(BUILD_CMD) |
324 |
++ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD) |
325 |
+ |
326 |
+ #$(AESTEST).o: $(AESTEST).c |
327 |
+ # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c |
328 |
+@@ -549,7 +549,7 @@ |
329 |
+ # fi |
330 |
+ |
331 |
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |
332 |
+- @target=dummytest; $(BUILD_CMD) |
333 |
++ +@target=dummytest; $(BUILD_CMD) |
334 |
+ |
335 |
+ # DO NOT DELETE THIS LINE -- make depend depends on it. |
336 |
+ |
337 |
|
338 |
diff --git a/dev-libs/openssl/openssl-1.0.2e.ebuild b/dev-libs/openssl/openssl-1.0.2e.ebuild |
339 |
index 1249476..2f7fd45 100644 |
340 |
--- a/dev-libs/openssl/openssl-1.0.2e.ebuild |
341 |
+++ b/dev-libs/openssl/openssl-1.0.2e.ebuild |
342 |
@@ -56,7 +56,7 @@ src_prepare() { |
343 |
if ! use vanilla ; then |
344 |
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 |
345 |
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 |
346 |
- epatch "${FILESDIR}"/${PN}-1.0.2d-parallel-build.patch |
347 |
+ epatch "${FILESDIR}"/${PN}-1.0.2e-parallel-build.patch |
348 |
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch |
349 |
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch |
350 |
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 |