1 Submitted By: Armin K. <krejzi at email dot com>
3 Initial Package Version: 1.0.1e
4 Upstream Status: Unknown
5 Origin: https://github.com/Alexpux/Qt-builds/tree/master/patches/openssl
6 Description: Fixes build when using more than one make job to build the package.
8 --- a/crypto/Makefile 2015-01-22 17:12:09.000000000 +0100
9 +++ b/crypto/Makefile 2015-01-23 16:42:13.460175569 +0100
11 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
14 - @target=all; $(RECURSIVE_MAKE)
15 + +@target=all; $(RECURSIVE_MAKE)
18 $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
19 - @target=files; $(RECURSIVE_MAKE)
20 + +@target=files; $(RECURSIVE_MAKE)
23 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
25 # lib: $(LIB): are splitted to avoid end-less loop
29 +$(LIB): $(LIBOBJ) | subdirs
30 $(AR) $(LIB) $(LIBOBJ)
31 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
32 $(RANLIB) $(LIB) || echo Never mind.
37 - @target=lib; $(RECURSIVE_MAKE)
38 + +@target=lib; $(RECURSIVE_MAKE)
41 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
43 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
44 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
46 - @target=install; $(RECURSIVE_MAKE)
47 + +@target=install; $(RECURSIVE_MAKE)
50 @target=lint; $(RECURSIVE_MAKE)
51 --- a/engines/Makefile 2015-01-22 17:12:24.000000000 +0100
52 +++ b/engines/Makefile 2015-01-23 16:42:13.461175596 +0100
58 +lib: $(LIBOBJ) | subdirs
59 @if [ -n "$(SHARED_LIBS)" ]; then \
61 for l in $(LIBNAMES); do \
66 - @target=all; $(RECURSIVE_MAKE)
67 + +@target=all; $(RECURSIVE_MAKE)
70 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
72 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
75 - @target=install; $(RECURSIVE_MAKE)
76 + +@target=install; $(RECURSIVE_MAKE)
80 --- a/Makefile.org 2015-01-22 15:58:06.000000000 +0100
81 +++ b/Makefile.org 2015-01-23 16:42:13.461175596 +0100
83 build_libs: build_crypto build_ssl build_engines
86 - @dir=crypto; target=all; $(BUILD_ONE_CMD)
88 - @dir=ssl; target=all; $(BUILD_ONE_CMD)
90 - @dir=engines; target=all; $(BUILD_ONE_CMD)
92 - @dir=apps; target=all; $(BUILD_ONE_CMD)
94 - @dir=test; target=all; $(BUILD_ONE_CMD)
96 - @dir=tools; target=all; $(BUILD_ONE_CMD)
97 + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
98 +build_ssl: build_crypto
99 + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
100 +build_engines: build_crypto
101 + +@dir=engines; target=all; $(BUILD_ONE_CMD)
102 +build_apps: build_libs
103 + +@dir=apps; target=all; $(BUILD_ONE_CMD)
104 +build_tests: build_libs
105 + +@dir=test; target=all; $(BUILD_ONE_CMD)
106 +build_tools: build_libs
107 + +@dir=tools; target=all; $(BUILD_ONE_CMD)
109 all_testapps: build_libs build_testapps
113 (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
115 -install: all install_docs install_sw
116 +install: install_docs install_sw
120 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
121 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
122 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
123 @@ -547,12 +547,19 @@
124 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
125 $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
126 $(INSTALL_PREFIX)$(OPENSSLDIR)/private
127 + @$(PERL) $(TOP)/util/mkdir-p.pl \
128 + $(INSTALL_PREFIX)$(MANDIR)/man1 \
129 + $(INSTALL_PREFIX)$(MANDIR)/man3 \
130 + $(INSTALL_PREFIX)$(MANDIR)/man5 \
131 + $(INSTALL_PREFIX)$(MANDIR)/man7
133 +install_sw: install_dirs
134 @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
136 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
137 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
139 - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
140 + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
141 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
143 if [ -f "$$i" ]; then \
149 - @$(PERL) $(TOP)/util/mkdir-p.pl \
150 - $(INSTALL_PREFIX)$(MANDIR)/man1 \
151 - $(INSTALL_PREFIX)$(MANDIR)/man3 \
152 - $(INSTALL_PREFIX)$(MANDIR)/man5 \
153 - $(INSTALL_PREFIX)$(MANDIR)/man7
154 +install_docs: install_dirs
155 @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
158 --- a/Makefile.shared 2015-01-20 13:33:36.000000000 +0100
159 +++ b/Makefile.shared 2015-01-23 16:42:13.461175596 +0100
161 SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
162 LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
163 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
164 + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
165 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
166 $${SHAREDCMD} $${SHAREDFLAGS} \
167 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
171 if [ -n "$$SHLIB_SOVER" ]; then \
172 + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
173 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
174 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
176 --- a/test/Makefile 2015-01-22 17:12:26.000000000 +0100
177 +++ b/test/Makefile 2015-01-23 16:42:13.461175596 +0100
182 -tests: exe apps $(TESTS)
186 @(cd ..; $(MAKE) DIRS=apps all)
187 @@ -398,109 +398,109 @@
188 link_app.$${shlib_target}
190 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
191 - @target=$(RSATEST); $(BUILD_CMD)
192 + +@target=$(RSATEST); $(BUILD_CMD)
194 $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
195 - @target=$(BNTEST); $(BUILD_CMD)
196 + +@target=$(BNTEST); $(BUILD_CMD)
198 $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
199 - @target=$(ECTEST); $(BUILD_CMD)
200 + +@target=$(ECTEST); $(BUILD_CMD)
202 $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
203 - @target=$(EXPTEST); $(BUILD_CMD)
204 + +@target=$(EXPTEST); $(BUILD_CMD)
206 $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
207 - @target=$(IDEATEST); $(BUILD_CMD)
208 + +@target=$(IDEATEST); $(BUILD_CMD)
210 $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
211 - @target=$(MD2TEST); $(BUILD_CMD)
212 + +@target=$(MD2TEST); $(BUILD_CMD)
214 $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
215 - @target=$(SHATEST); $(BUILD_CMD)
216 + +@target=$(SHATEST); $(BUILD_CMD)
218 $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
219 - @target=$(SHA1TEST); $(BUILD_CMD)
220 + +@target=$(SHA1TEST); $(BUILD_CMD)
222 $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
223 - @target=$(SHA256TEST); $(BUILD_CMD)
224 + +@target=$(SHA256TEST); $(BUILD_CMD)
226 $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
227 - @target=$(SHA512TEST); $(BUILD_CMD)
228 + +@target=$(SHA512TEST); $(BUILD_CMD)
230 $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
231 - @target=$(RMDTEST); $(BUILD_CMD)
232 + +@target=$(RMDTEST); $(BUILD_CMD)
234 $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
235 - @target=$(MDC2TEST); $(BUILD_CMD)
236 + +@target=$(MDC2TEST); $(BUILD_CMD)
238 $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
239 - @target=$(MD4TEST); $(BUILD_CMD)
240 + +@target=$(MD4TEST); $(BUILD_CMD)
242 $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
243 - @target=$(MD5TEST); $(BUILD_CMD)
244 + +@target=$(MD5TEST); $(BUILD_CMD)
246 $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
247 - @target=$(HMACTEST); $(BUILD_CMD)
248 + +@target=$(HMACTEST); $(BUILD_CMD)
250 $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
251 - @target=$(WPTEST); $(BUILD_CMD)
252 + +@target=$(WPTEST); $(BUILD_CMD)
254 $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
255 - @target=$(RC2TEST); $(BUILD_CMD)
256 + +@target=$(RC2TEST); $(BUILD_CMD)
258 $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
259 - @target=$(BFTEST); $(BUILD_CMD)
260 + +@target=$(BFTEST); $(BUILD_CMD)
262 $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
263 - @target=$(CASTTEST); $(BUILD_CMD)
264 + +@target=$(CASTTEST); $(BUILD_CMD)
266 $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
267 - @target=$(RC4TEST); $(BUILD_CMD)
268 + +@target=$(RC4TEST); $(BUILD_CMD)
270 $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
271 - @target=$(RC5TEST); $(BUILD_CMD)
272 + +@target=$(RC5TEST); $(BUILD_CMD)
274 $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
275 - @target=$(DESTEST); $(BUILD_CMD)
276 + +@target=$(DESTEST); $(BUILD_CMD)
278 $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
279 - @target=$(RANDTEST); $(BUILD_CMD)
280 + +@target=$(RANDTEST); $(BUILD_CMD)
282 $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
283 - @target=$(DHTEST); $(BUILD_CMD)
284 + +@target=$(DHTEST); $(BUILD_CMD)
286 $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
287 - @target=$(DSATEST); $(BUILD_CMD)
288 + +@target=$(DSATEST); $(BUILD_CMD)
290 $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
291 - @target=$(METHTEST); $(BUILD_CMD)
292 + +@target=$(METHTEST); $(BUILD_CMD)
294 $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
295 - @target=$(SSLTEST); $(FIPS_BUILD_CMD)
296 + +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
298 $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
299 - @target=$(ENGINETEST); $(BUILD_CMD)
300 + +@target=$(ENGINETEST); $(BUILD_CMD)
302 $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
303 - @target=$(EVPTEST); $(BUILD_CMD)
304 + +@target=$(EVPTEST); $(BUILD_CMD)
306 $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
307 - @target=$(ECDSATEST); $(BUILD_CMD)
308 + +@target=$(ECDSATEST); $(BUILD_CMD)
310 $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
311 - @target=$(ECDHTEST); $(BUILD_CMD)
312 + +@target=$(ECDHTEST); $(BUILD_CMD)
314 $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
315 - @target=$(IGETEST); $(BUILD_CMD)
316 + +@target=$(IGETEST); $(BUILD_CMD)
318 $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
319 - @target=$(JPAKETEST); $(BUILD_CMD)
320 + +@target=$(JPAKETEST); $(BUILD_CMD)
322 $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
323 - @target=$(ASN1TEST); $(BUILD_CMD)
324 + +@target=$(ASN1TEST); $(BUILD_CMD)
326 $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
327 - @target=$(SRPTEST); $(BUILD_CMD)
328 + +@target=$(SRPTEST); $(BUILD_CMD)
330 $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
331 @target=$(V3NAMETEST); $(BUILD_CMD)
335 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
336 - @target=dummytest; $(BUILD_CMD)
337 + +@target=dummytest; $(BUILD_CMD)
339 # DO NOT DELETE THIS LINE -- make depend depends on it.