337 lines
10 KiB
Diff
337 lines
10 KiB
Diff
|
Fix the parallel races in the Makefiles.
|
||
|
|
|
||
|
|
This patch was taken from the Gentoo packaging:
|
||
|
|
https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2g-parallel-build.patch
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||
|
|
|
||
|
|
Refreshed for 1.0.2i
|
||
|
|
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
|
||
|
|
|
||
|
|
--- openssl-1.0.2g/crypto/Makefile
|
||
|
|
+++ openssl-1.0.2g/crypto/Makefile
|
||
|
|
@@ -85,11 +85,11 @@
|
||
|
|
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
|
||
|
|
|
||
|
|
subdirs:
|
||
|
|
- @target=all; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=all; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
files:
|
||
|
|
$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
|
||
|
|
- @target=files; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=files; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
links:
|
||
|
|
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
|
||
|
|
@@ -100,7 +100,7 @@
|
||
|
|
# lib: $(LIB): are splitted to avoid end-less loop
|
||
|
|
lib: $(LIB)
|
||
|
|
@touch lib
|
||
|
|
-$(LIB): $(LIBOBJ)
|
||
|
|
+$(LIB): $(LIBOBJ) | subdirs
|
||
|
|
$(AR) $(LIB) $(LIBOBJ)
|
||
|
|
test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
|
||
|
|
$(RANLIB) $(LIB) || echo Never mind.
|
||
|
|
@@ -111,7 +111,7 @@
|
||
|
|
fi
|
||
|
|
|
||
|
|
libs:
|
||
|
|
- @target=lib; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=lib; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
install:
|
||
|
|
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
||
|
|
@@ -120,7 +120,7 @@
|
||
|
|
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||
|
|
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||
|
|
done;
|
||
|
|
- @target=install; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=install; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
lint:
|
||
|
|
@target=lint; $(RECURSIVE_MAKE)
|
||
|
|
--- openssl-1.0.2g/engines/Makefile
|
||
|
|
+++ openssl-1.0.2g/engines/Makefile
|
||
|
|
@@ -72,7 +72,7 @@
|
||
|
|
|
||
|
|
all: lib subdirs
|
||
|
|
|
||
|
|
-lib: $(LIBOBJ)
|
||
|
|
+lib: $(LIBOBJ) | subdirs
|
||
|
|
@if [ -n "$(SHARED_LIBS)" ]; then \
|
||
|
|
set -e; \
|
||
|
|
for l in $(LIBNAMES); do \
|
||
|
|
@@ -89,7 +89,7 @@
|
||
|
|
|
||
|
|
subdirs:
|
||
|
|
echo $(EDIRS)
|
||
|
|
- @target=all; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=all; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
files:
|
||
|
|
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
|
||
|
|
@@ -128,7 +128,7 @@
|
||
|
|
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
|
||
|
|
done; \
|
||
|
|
fi
|
||
|
|
- @target=install; $(RECURSIVE_MAKE)
|
||
|
|
+ +@target=install; $(RECURSIVE_MAKE)
|
||
|
|
|
||
|
|
tags:
|
||
|
|
ctags $(SRC)
|
||
|
|
--- openssl-1.0.2g/Makefile.org
|
||
|
|
+++ openssl-1.0.2g/Makefile.org
|
||
|
|
@@ -279,17 +279,17 @@
|
||
|
|
build_libssl: build_ssl libssl.pc
|
||
|
|
|
||
|
|
build_crypto:
|
||
|
|
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
|
||
|
|
build_ssl: build_crypto
|
||
|
|
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
|
||
|
|
build_engines: build_crypto
|
||
|
|
- @dir=engines; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
|
||
|
|
build_apps: build_libs
|
||
|
|
- @dir=apps; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
|
||
|
|
build_tests: build_libs
|
||
|
|
- @dir=test; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
|
||
|
|
build_tools: build_libs
|
||
|
|
- @dir=tools; target=all; $(BUILD_ONE_CMD)
|
||
|
|
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
|
||
|
|
|
||
|
|
all_testapps: build_libs build_testapps
|
||
|
|
build_testapps:
|
||
|
|
@@ -544,7 +544,7 @@
|
||
|
|
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||
|
|
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||
|
|
done;
|
||
|
|
- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
||
|
|
+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
|
||
|
|
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
|
||
|
|
do \
|
||
|
|
if [ -f "$$i" ]; then \
|
||
|
|
--- openssl-1.0.2g/Makefile.shared
|
||
|
|
+++ openssl-1.0.2g/Makefile.shared
|
||
|
|
@@ -105,6 +105,7 @@
|
||
|
|
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
|
||
|
|
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
|
||
|
|
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
|
||
|
|
+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
|
||
|
|
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
|
||
|
|
$${SHAREDCMD} $${SHAREDFLAGS} \
|
||
|
|
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
|
||
|
|
@@ -122,6 +123,7 @@
|
||
|
|
done; \
|
||
|
|
fi; \
|
||
|
|
if [ -n "$$SHLIB_SOVER" ]; then \
|
||
|
|
+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
|
||
|
|
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
|
||
|
|
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
||
|
|
fi; \
|
||
|
|
--- openssl-1.0.2g/test/Makefile
|
||
|
|
+++ openssl-1.0.2g/test/Makefile
|
||
|
|
@@ -144,7 +144,7 @@
|
||
|
|
tags:
|
||
|
|
ctags $(SRC)
|
||
|
|
|
||
|
|
-tests: exe apps $(TESTS)
|
||
|
|
+tests: exe $(TESTS)
|
||
|
|
|
||
|
|
apps:
|
||
|
|
@(cd ..; $(MAKE) DIRS=apps all)
|
||
|
|
@@ -438,136 +438,136 @@
|
||
|
|
link_app.$${shlib_target}
|
||
|
|
|
||
|
|
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RSATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RSATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(BNTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(BNTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(ECTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(ECTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(EXPTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(EXPTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(IDEATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(IDEATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(MD2TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(MD2TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(SHATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(SHATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(SHA1TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(SHA1TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(SHA256TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(SHA256TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(SHA512TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(SHA512TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RMDTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RMDTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(MDC2TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(MDC2TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(MD4TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(MD4TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(MD5TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(MD5TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(HMACTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(HMACTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(WPTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(WPTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RC2TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RC2TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(BFTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(BFTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(CASTTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(CASTTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RC4TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RC4TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RC5TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RC5TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(DESTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(DESTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(RANDTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(RANDTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(DHTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(DHTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(DSATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(DSATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(METHTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(METHTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
|
||
|
|
- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
||
|
|
+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
|
||
|
|
|
||
|
|
$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(ENGINETEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(ENGINETEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(EVPTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(EVPTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(EVPEXTRATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(EVPEXTRATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(ECDSATEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(ECDSATEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(ECDHTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(ECDHTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(IGETEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(IGETEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(JPAKETEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(JPAKETEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(ASN1TEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(ASN1TEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(SRPTEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(SRPTEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(V3NAMETEST); $(BUILD_CMD)
|
||
|
|
+ +@target=$(V3NAMETEST); $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
|
||
|
|
- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
|
||
|
|
+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
|
||
|
|
|
||
|
|
$(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
|
||
|
|
- @target=$(CONSTTIMETEST) $(BUILD_CMD)
|
||
|
|
+ +@target=$(CONSTTIMETEST) $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
|
||
|
|
- @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
|
||
|
|
+ +@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
|
||
|
|
- @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
|
||
|
|
+ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(BADDTLSTEST)$(EXE_EXT): $(BADDTLSTEST).o
|
||
|
|
- @target=$(BADDTLSTEST) $(BUILD_CMD)
|
||
|
|
+ +@target=$(BADDTLSTEST) $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
|
||
|
|
- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
|
||
|
|
+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
|
||
|
|
|
||
|
|
$(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO)
|
||
|
|
- @target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
|
||
|
|
+ +@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD)
|
||
|
|
|
||
|
|
#$(AESTEST).o: $(AESTEST).c
|
||
|
|
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
|
||
|
|
@@ -580,6 +580,6 @@
|
||
|
|
# fi
|
||
|
|
|
||
|
|
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
|
||
|
|
- @target=dummytest; $(BUILD_CMD)
|
||
|
|
+ +@target=dummytest; $(BUILD_CMD)
|
||
|
|
|
||
|
|
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||
|
|
|