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