1 |
vapier 11/12/01 05:35:47 |
2 |
|
3 |
Added: openssl-1.0.0e-parallel-build.patch |
4 |
openssl-1.0.0e-pkg-config.patch |
5 |
Log: |
6 |
Remove CROSS_COMPILE from the env since we setup all the tools explicitly #311473 by Thomas Sachau. Add USE=static-libs support #378259 by Agostino Sarubbo. Try and fix up parallel build yet again #196554 by Duncan. Clean up the pkg-config files to keep --libs clean (not include --static output). |
7 |
|
8 |
(Portage version: 2.2.0_alpha75/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-libs/openssl/files/openssl-1.0.0e-parallel-build.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.0e-parallel-build.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.0e-parallel-build.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: openssl-1.0.0e-parallel-build.patch |
17 |
=================================================================== |
18 |
http://rt.openssl.org/Ticket/Display.html?id=2084 |
19 |
|
20 |
--- a/Makefile.org |
21 |
+++ b/Makefile.org |
22 |
@@ -247,17 +247,17 @@ |
23 |
build_libs: build_crypto build_ssl build_engines |
24 |
|
25 |
build_crypto: |
26 |
- @dir=crypto; target=all; $(BUILD_ONE_CMD) |
27 |
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) |
28 |
-build_ssl: |
29 |
+build_ssl: build_crypto |
30 |
- @dir=ssl; target=all; $(BUILD_ONE_CMD) |
31 |
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) |
32 |
-build_engines: |
33 |
+build_engines: build_crypto |
34 |
- @dir=engines; target=all; $(BUILD_ONE_CMD) |
35 |
+ +@dir=engines; target=all; $(BUILD_ONE_CMD) |
36 |
-build_apps: |
37 |
+build_apps: build_libs |
38 |
- @dir=apps; target=all; $(BUILD_ONE_CMD) |
39 |
+ +@dir=apps; target=all; $(BUILD_ONE_CMD) |
40 |
-build_tests: |
41 |
+build_tests: build_libs |
42 |
- @dir=test; target=all; $(BUILD_ONE_CMD) |
43 |
+ +@dir=test; target=all; $(BUILD_ONE_CMD) |
44 |
-build_tools: |
45 |
+build_tools: build_libs |
46 |
- @dir=tools; target=all; $(BUILD_ONE_CMD) |
47 |
+ +@dir=tools; target=all; $(BUILD_ONE_CMD) |
48 |
|
49 |
all_testapps: build_libs build_testapps |
50 |
build_testapps: |
51 |
@@ -497,9 +497,9 @@ |
52 |
dist_pem_h: |
53 |
(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) |
54 |
|
55 |
-install: all install_docs install_sw |
56 |
+install: install_docs install_sw |
57 |
|
58 |
-install_sw: |
59 |
+install_dirs: |
60 |
@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ |
61 |
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ |
62 |
$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ |
63 |
@@ -508,6 +508,13 @@ |
64 |
$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ |
65 |
$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ |
66 |
$(INSTALL_PREFIX)$(OPENSSLDIR)/private |
67 |
+ @$(PERL) $(TOP)/util/mkdir-p.pl \ |
68 |
+ $(INSTALL_PREFIX)$(MANDIR)/man1 \ |
69 |
+ $(INSTALL_PREFIX)$(MANDIR)/man3 \ |
70 |
+ $(INSTALL_PREFIX)$(MANDIR)/man5 \ |
71 |
+ $(INSTALL_PREFIX)$(MANDIR)/man7 |
72 |
+ |
73 |
+install_sw: install_dirs |
74 |
@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ |
75 |
do \ |
76 |
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
77 |
@@ -511,7 +511,7 @@ |
78 |
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
79 |
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
80 |
done; |
81 |
- @set -e; target=install; $(RECURSIVE_BUILD_CMD) |
82 |
+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) |
83 |
@set -e; for i in $(LIBS) ;\ |
84 |
do \ |
85 |
if [ -f "$$i" ]; then \ |
86 |
@@ -593,12 +600,7 @@ |
87 |
done; \ |
88 |
done |
89 |
|
90 |
-install_docs: |
91 |
- @$(PERL) $(TOP)/util/mkdir-p.pl \ |
92 |
- $(INSTALL_PREFIX)$(MANDIR)/man1 \ |
93 |
- $(INSTALL_PREFIX)$(MANDIR)/man3 \ |
94 |
- $(INSTALL_PREFIX)$(MANDIR)/man5 \ |
95 |
- $(INSTALL_PREFIX)$(MANDIR)/man7 |
96 |
+install_docs: install_dirs |
97 |
@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ |
98 |
here="`pwd`"; \ |
99 |
filecase=; \ |
100 |
--- a/crypto/Makefile |
101 |
+++ b/crypto/Makefile |
102 |
@@ -85,11 +85,11 @@ |
103 |
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi |
104 |
|
105 |
subdirs: |
106 |
- @target=all; $(RECURSIVE_MAKE) |
107 |
+ +@target=all; $(RECURSIVE_MAKE) |
108 |
|
109 |
files: |
110 |
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
111 |
- @target=files; $(RECURSIVE_MAKE) |
112 |
+ +@target=files; $(RECURSIVE_MAKE) |
113 |
|
114 |
links: |
115 |
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) |
116 |
@@ -100,7 +100,7 @@ |
117 |
# lib: $(LIB): are splitted to avoid end-less loop |
118 |
lib: $(LIB) |
119 |
@touch lib |
120 |
-$(LIB): $(LIBOBJ) |
121 |
+$(LIB): $(LIBOBJ) | subdirs |
122 |
$(AR) $(LIB) $(LIBOBJ) |
123 |
$(RANLIB) $(LIB) || echo Never mind. |
124 |
|
125 |
@@ -110,7 +110,7 @@ |
126 |
fi |
127 |
|
128 |
libs: |
129 |
- @target=lib; $(RECURSIVE_MAKE) |
130 |
+ +@target=lib; $(RECURSIVE_MAKE) |
131 |
|
132 |
install: |
133 |
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
134 |
@@ -119,7 +119,7 @@ |
135 |
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
136 |
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
137 |
done; |
138 |
- @target=install; $(RECURSIVE_MAKE) |
139 |
+ +@target=install; $(RECURSIVE_MAKE) |
140 |
|
141 |
lint: |
142 |
@target=lint; $(RECURSIVE_MAKE) |
143 |
--- a/engines/Makefile |
144 |
+++ b/engines/Makefile |
145 |
@@ -72,7 +72,7 @@ |
146 |
|
147 |
all: lib subdirs |
148 |
|
149 |
-lib: $(LIBOBJ) |
150 |
+lib: $(LIBOBJ) | subdirs |
151 |
@if [ -n "$(SHARED_LIBS)" ]; then \ |
152 |
set -e; \ |
153 |
for l in $(LIBNAMES); do \ |
154 |
@@ -89,7 +89,7 @@ |
155 |
|
156 |
subdirs: |
157 |
echo $(EDIRS) |
158 |
- @target=all; $(RECURSIVE_MAKE) |
159 |
+ +@target=all; $(RECURSIVE_MAKE) |
160 |
|
161 |
files: |
162 |
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
163 |
@@ -128,7 +128,7 @@ |
164 |
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
165 |
done; \ |
166 |
fi |
167 |
- @target=install; $(RECURSIVE_MAKE) |
168 |
+ +@target=install; $(RECURSIVE_MAKE) |
169 |
|
170 |
tags: |
171 |
ctags $(SRC) |
172 |
--- a/test/Makefile |
173 |
+++ b/test/Makefile |
174 |
@@ -123,7 +123,7 @@ |
175 |
tags: |
176 |
ctags $(SRC) |
177 |
|
178 |
-tests: exe apps $(TESTS) |
179 |
+tests: exe $(TESTS) |
180 |
|
181 |
apps: |
182 |
@(cd ..; $(MAKE) DIRS=apps all) |
183 |
@@ -345,106 +345,106 @@ |
184 |
link_app.$${shlib_target} |
185 |
|
186 |
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) |
187 |
- @target=$(RSATEST); $(BUILD_CMD) |
188 |
+ +@target=$(RSATEST); $(BUILD_CMD) |
189 |
|
190 |
$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) |
191 |
- @target=$(BNTEST); $(BUILD_CMD) |
192 |
+ +@target=$(BNTEST); $(BUILD_CMD) |
193 |
|
194 |
$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) |
195 |
- @target=$(ECTEST); $(BUILD_CMD) |
196 |
+ +@target=$(ECTEST); $(BUILD_CMD) |
197 |
|
198 |
$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) |
199 |
- @target=$(EXPTEST); $(BUILD_CMD) |
200 |
+ +@target=$(EXPTEST); $(BUILD_CMD) |
201 |
|
202 |
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) |
203 |
- @target=$(IDEATEST); $(BUILD_CMD) |
204 |
+ +@target=$(IDEATEST); $(BUILD_CMD) |
205 |
|
206 |
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) |
207 |
- @target=$(MD2TEST); $(BUILD_CMD) |
208 |
+ +@target=$(MD2TEST); $(BUILD_CMD) |
209 |
|
210 |
$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) |
211 |
- @target=$(SHATEST); $(BUILD_CMD) |
212 |
+ +@target=$(SHATEST); $(BUILD_CMD) |
213 |
|
214 |
$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) |
215 |
- @target=$(SHA1TEST); $(BUILD_CMD) |
216 |
+ +@target=$(SHA1TEST); $(BUILD_CMD) |
217 |
|
218 |
$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) |
219 |
- @target=$(SHA256TEST); $(BUILD_CMD) |
220 |
+ +@target=$(SHA256TEST); $(BUILD_CMD) |
221 |
|
222 |
$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) |
223 |
- @target=$(SHA512TEST); $(BUILD_CMD) |
224 |
+ +@target=$(SHA512TEST); $(BUILD_CMD) |
225 |
|
226 |
$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) |
227 |
- @target=$(RMDTEST); $(BUILD_CMD) |
228 |
+ +@target=$(RMDTEST); $(BUILD_CMD) |
229 |
|
230 |
$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) |
231 |
- @target=$(MDC2TEST); $(BUILD_CMD) |
232 |
+ +@target=$(MDC2TEST); $(BUILD_CMD) |
233 |
|
234 |
$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) |
235 |
- @target=$(MD4TEST); $(BUILD_CMD) |
236 |
+ +@target=$(MD4TEST); $(BUILD_CMD) |
237 |
|
238 |
$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) |
239 |
- @target=$(MD5TEST); $(BUILD_CMD) |
240 |
+ +@target=$(MD5TEST); $(BUILD_CMD) |
241 |
|
242 |
$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) |
243 |
- @target=$(HMACTEST); $(BUILD_CMD) |
244 |
+ +@target=$(HMACTEST); $(BUILD_CMD) |
245 |
|
246 |
$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) |
247 |
- @target=$(WPTEST); $(BUILD_CMD) |
248 |
+ +@target=$(WPTEST); $(BUILD_CMD) |
249 |
|
250 |
$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) |
251 |
- @target=$(RC2TEST); $(BUILD_CMD) |
252 |
+ +@target=$(RC2TEST); $(BUILD_CMD) |
253 |
|
254 |
$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) |
255 |
- @target=$(BFTEST); $(BUILD_CMD) |
256 |
+ +@target=$(BFTEST); $(BUILD_CMD) |
257 |
|
258 |
$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) |
259 |
- @target=$(CASTTEST); $(BUILD_CMD) |
260 |
+ +@target=$(CASTTEST); $(BUILD_CMD) |
261 |
|
262 |
$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) |
263 |
- @target=$(RC4TEST); $(BUILD_CMD) |
264 |
+ +@target=$(RC4TEST); $(BUILD_CMD) |
265 |
|
266 |
$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) |
267 |
- @target=$(RC5TEST); $(BUILD_CMD) |
268 |
+ +@target=$(RC5TEST); $(BUILD_CMD) |
269 |
|
270 |
$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) |
271 |
- @target=$(DESTEST); $(BUILD_CMD) |
272 |
+ +@target=$(DESTEST); $(BUILD_CMD) |
273 |
|
274 |
$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) |
275 |
- @target=$(RANDTEST); $(BUILD_CMD) |
276 |
+ +@target=$(RANDTEST); $(BUILD_CMD) |
277 |
|
278 |
$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) |
279 |
- @target=$(DHTEST); $(BUILD_CMD) |
280 |
+ +@target=$(DHTEST); $(BUILD_CMD) |
281 |
|
282 |
$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) |
283 |
- @target=$(DSATEST); $(BUILD_CMD) |
284 |
+ +@target=$(DSATEST); $(BUILD_CMD) |
285 |
|
286 |
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) |
287 |
- @target=$(METHTEST); $(BUILD_CMD) |
288 |
+ +@target=$(METHTEST); $(BUILD_CMD) |
289 |
|
290 |
$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) |
291 |
- @target=$(SSLTEST); $(BUILD_CMD) |
292 |
+ +@target=$(SSLTEST); $(BUILD_CMD) |
293 |
|
294 |
$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) |
295 |
- @target=$(ENGINETEST); $(BUILD_CMD) |
296 |
+ +@target=$(ENGINETEST); $(BUILD_CMD) |
297 |
|
298 |
$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) |
299 |
- @target=$(EVPTEST); $(BUILD_CMD) |
300 |
+ +@target=$(EVPTEST); $(BUILD_CMD) |
301 |
|
302 |
$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) |
303 |
- @target=$(ECDSATEST); $(BUILD_CMD) |
304 |
+ +@target=$(ECDSATEST); $(BUILD_CMD) |
305 |
|
306 |
$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) |
307 |
- @target=$(ECDHTEST); $(BUILD_CMD) |
308 |
+ +@target=$(ECDHTEST); $(BUILD_CMD) |
309 |
|
310 |
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) |
311 |
- @target=$(IGETEST); $(BUILD_CMD) |
312 |
+ +@target=$(IGETEST); $(BUILD_CMD) |
313 |
|
314 |
$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) |
315 |
- @target=$(JPAKETEST); $(BUILD_CMD) |
316 |
+ +@target=$(JPAKETEST); $(BUILD_CMD) |
317 |
|
318 |
$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) |
319 |
- @target=$(ASN1TEST); $(BUILD_CMD) |
320 |
+ +@target=$(ASN1TEST); $(BUILD_CMD) |
321 |
|
322 |
#$(AESTEST).o: $(AESTEST).c |
323 |
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c |
324 |
@@ -457,7 +457,7 @@ |
325 |
# fi |
326 |
|
327 |
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) |
328 |
- @target=dummytest; $(BUILD_CMD) |
329 |
+ +@target=dummytest; $(BUILD_CMD) |
330 |
|
331 |
# DO NOT DELETE THIS LINE -- make depend depends on it. |
332 |
|
333 |
|
334 |
|
335 |
|
336 |
1.1 dev-libs/openssl/files/openssl-1.0.0e-pkg-config.patch |
337 |
|
338 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.0e-pkg-config.patch?rev=1.1&view=markup |
339 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.0e-pkg-config.patch?rev=1.1&content-type=text/plain |
340 |
|
341 |
Index: openssl-1.0.0e-pkg-config.patch |
342 |
=================================================================== |
343 |
move internal libraries to ".private" fields so that the default |
344 |
--libs output matches only what we need |
345 |
|
346 |
--- a/Makefile.org |
347 |
+++ b/Makefile.org |
348 |
@@ -325,7 +325,8 @@ libcrypto.pc: Makefile |
349 |
echo 'Description: OpenSSL cryptography library'; \ |
350 |
echo 'Version: '$(VERSION); \ |
351 |
echo 'Requires: '; \ |
352 |
- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \ |
353 |
+ echo 'Libs: -L$${libdir} -lcrypto'; \ |
354 |
+ echo 'Libs.private: $(EX_LIBS)'; \ |
355 |
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc |
356 |
|
357 |
libssl.pc: Makefile |
358 |
@@ -334,11 +335,12 @@ libssl.pc: Makefile |
359 |
echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ |
360 |
echo 'includedir=$${prefix}/include'; \ |
361 |
echo ''; \ |
362 |
- echo 'Name: OpenSSL'; \ |
363 |
+ echo 'Name: OpenSSL-libssl'; \ |
364 |
echo 'Description: Secure Sockets Layer and cryptography libraries'; \ |
365 |
echo 'Version: '$(VERSION); \ |
366 |
- echo 'Requires: '; \ |
367 |
- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ |
368 |
+ echo 'Requires.private: libcrypto'; \ |
369 |
+ echo 'Libs: -L$${libdir} -lssl'; \ |
370 |
+ echo 'Libs.private: $(EX_LIBS)'; \ |
371 |
echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc |
372 |
|
373 |
openssl.pc: Makefile |
374 |
@@ -350,9 +352,7 @@ openssl.pc: Makefile |
375 |
echo 'Name: OpenSSL'; \ |
376 |
echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ |
377 |
echo 'Version: '$(VERSION); \ |
378 |
- echo 'Requires: '; \ |
379 |
- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \ |
380 |
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc |
381 |
+ echo 'Requires: libssl libcrypto' ) > openssl.pc |
382 |
|
383 |
Makefile: Makefile.org Configure config |
384 |
@echo "Makefile is older than Makefile.org, Configure or config." |