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