openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d 9.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309
  1. https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
  2. https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
  3. --- openssl-1.0.2d/crypto/Makefile
  4. +++ openssl-1.0.2d/crypto/Makefile
  5. @@ -85,11 +85,11 @@
  6. @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  7. subdirs:
  8. - @target=all; $(RECURSIVE_MAKE)
  9. + +@target=all; $(RECURSIVE_MAKE)
  10. files:
  11. $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
  12. - @target=files; $(RECURSIVE_MAKE)
  13. + +@target=files; $(RECURSIVE_MAKE)
  14. links:
  15. @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
  16. @@ -100,7 +100,7 @@
  17. # lib: $(LIB): are splitted to avoid end-less loop
  18. lib: $(LIB)
  19. @touch lib
  20. -$(LIB): $(LIBOBJ)
  21. +$(LIB): $(LIBOBJ) | subdirs
  22. $(AR) $(LIB) $(LIBOBJ)
  23. test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
  24. $(RANLIB) $(LIB) || echo Never mind.
  25. @@ -111,7 +111,7 @@
  26. fi
  27. libs:
  28. - @target=lib; $(RECURSIVE_MAKE)
  29. + +@target=lib; $(RECURSIVE_MAKE)
  30. install:
  31. @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
  32. @@ -120,7 +120,7 @@
  33. (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  34. chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  35. done;
  36. - @target=install; $(RECURSIVE_MAKE)
  37. + +@target=install; $(RECURSIVE_MAKE)
  38. lint:
  39. @target=lint; $(RECURSIVE_MAKE)
  40. --- openssl-1.0.2d/engines/Makefile
  41. +++ openssl-1.0.2d/engines/Makefile
  42. @@ -72,7 +72,7 @@
  43. all: lib subdirs
  44. -lib: $(LIBOBJ)
  45. +lib: $(LIBOBJ) | subdirs
  46. @if [ -n "$(SHARED_LIBS)" ]; then \
  47. set -e; \
  48. for l in $(LIBNAMES); do \
  49. @@ -89,7 +89,7 @@
  50. subdirs:
  51. echo $(EDIRS)
  52. - @target=all; $(RECURSIVE_MAKE)
  53. + +@target=all; $(RECURSIVE_MAKE)
  54. files:
  55. $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
  56. @@ -128,7 +128,7 @@
  57. mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
  58. done; \
  59. fi
  60. - @target=install; $(RECURSIVE_MAKE)
  61. + +@target=install; $(RECURSIVE_MAKE)
  62. tags:
  63. ctags $(SRC)
  64. --- openssl-1.0.2d/Makefile.org
  65. +++ openssl-1.0.2d/Makefile.org
  66. @@ -274,17 +274,17 @@
  67. build_libs: build_crypto build_ssl build_engines
  68. build_crypto:
  69. - @dir=crypto; target=all; $(BUILD_ONE_CMD)
  70. + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
  71. build_ssl: build_crypto
  72. - @dir=ssl; target=all; $(BUILD_ONE_CMD)
  73. + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
  74. build_engines: build_crypto
  75. - @dir=engines; target=all; $(BUILD_ONE_CMD)
  76. + +@dir=engines; target=all; $(BUILD_ONE_CMD)
  77. build_apps: build_libs
  78. - @dir=apps; target=all; $(BUILD_ONE_CMD)
  79. + +@dir=apps; target=all; $(BUILD_ONE_CMD)
  80. build_tests: build_libs
  81. - @dir=test; target=all; $(BUILD_ONE_CMD)
  82. + +@dir=test; target=all; $(BUILD_ONE_CMD)
  83. build_tools: build_libs
  84. - @dir=tools; target=all; $(BUILD_ONE_CMD)
  85. + +@dir=tools; target=all; $(BUILD_ONE_CMD)
  86. all_testapps: build_libs build_testapps
  87. build_testapps:
  88. @@ -555,7 +555,7 @@
  89. (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  90. chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  91. done;
  92. - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
  93. + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
  94. @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  95. do \
  96. if [ -f "$$i" ]; then \
  97. --- openssl-1.0.2d/Makefile.shared
  98. +++ openssl-1.0.2d/Makefile.shared
  99. @@ -105,6 +105,7 @@
  100. SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
  101. LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
  102. LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
  103. + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
  104. LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
  105. $${SHAREDCMD} $${SHAREDFLAGS} \
  106. -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
  107. @@ -122,6 +123,7 @@
  108. done; \
  109. fi; \
  110. if [ -n "$$SHLIB_SOVER" ]; then \
  111. + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
  112. ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
  113. ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
  114. fi; \
  115. --- openssl-1.0.2d/test/Makefile
  116. +++ openssl-1.0.2d/test/Makefile
  117. @@ -133,7 +133,7 @@
  118. tags:
  119. ctags $(SRC)
  120. -tests: exe apps $(TESTS)
  121. +tests: exe $(TESTS)
  122. apps:
  123. @(cd ..; $(MAKE) DIRS=apps all)
  124. @@ -402,121 +402,121 @@
  125. link_app.$${shlib_target}
  126. $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
  127. - @target=$(RSATEST); $(BUILD_CMD)
  128. + +@target=$(RSATEST); $(BUILD_CMD)
  129. $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
  130. - @target=$(BNTEST); $(BUILD_CMD)
  131. + +@target=$(BNTEST); $(BUILD_CMD)
  132. $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
  133. - @target=$(ECTEST); $(BUILD_CMD)
  134. + +@target=$(ECTEST); $(BUILD_CMD)
  135. $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
  136. - @target=$(EXPTEST); $(BUILD_CMD)
  137. + +@target=$(EXPTEST); $(BUILD_CMD)
  138. $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
  139. - @target=$(IDEATEST); $(BUILD_CMD)
  140. + +@target=$(IDEATEST); $(BUILD_CMD)
  141. $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
  142. - @target=$(MD2TEST); $(BUILD_CMD)
  143. + +@target=$(MD2TEST); $(BUILD_CMD)
  144. $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
  145. - @target=$(SHATEST); $(BUILD_CMD)
  146. + +@target=$(SHATEST); $(BUILD_CMD)
  147. $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
  148. - @target=$(SHA1TEST); $(BUILD_CMD)
  149. + +@target=$(SHA1TEST); $(BUILD_CMD)
  150. $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
  151. - @target=$(SHA256TEST); $(BUILD_CMD)
  152. + +@target=$(SHA256TEST); $(BUILD_CMD)
  153. $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
  154. - @target=$(SHA512TEST); $(BUILD_CMD)
  155. + +@target=$(SHA512TEST); $(BUILD_CMD)
  156. $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
  157. - @target=$(RMDTEST); $(BUILD_CMD)
  158. + +@target=$(RMDTEST); $(BUILD_CMD)
  159. $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
  160. - @target=$(MDC2TEST); $(BUILD_CMD)
  161. + +@target=$(MDC2TEST); $(BUILD_CMD)
  162. $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
  163. - @target=$(MD4TEST); $(BUILD_CMD)
  164. + +@target=$(MD4TEST); $(BUILD_CMD)
  165. $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
  166. - @target=$(MD5TEST); $(BUILD_CMD)
  167. + +@target=$(MD5TEST); $(BUILD_CMD)
  168. $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
  169. - @target=$(HMACTEST); $(BUILD_CMD)
  170. + +@target=$(HMACTEST); $(BUILD_CMD)
  171. $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
  172. - @target=$(WPTEST); $(BUILD_CMD)
  173. + +@target=$(WPTEST); $(BUILD_CMD)
  174. $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
  175. - @target=$(RC2TEST); $(BUILD_CMD)
  176. + +@target=$(RC2TEST); $(BUILD_CMD)
  177. $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
  178. - @target=$(BFTEST); $(BUILD_CMD)
  179. + +@target=$(BFTEST); $(BUILD_CMD)
  180. $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
  181. - @target=$(CASTTEST); $(BUILD_CMD)
  182. + +@target=$(CASTTEST); $(BUILD_CMD)
  183. $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
  184. - @target=$(RC4TEST); $(BUILD_CMD)
  185. + +@target=$(RC4TEST); $(BUILD_CMD)
  186. $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
  187. - @target=$(RC5TEST); $(BUILD_CMD)
  188. + +@target=$(RC5TEST); $(BUILD_CMD)
  189. $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
  190. - @target=$(DESTEST); $(BUILD_CMD)
  191. + +@target=$(DESTEST); $(BUILD_CMD)
  192. $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
  193. - @target=$(RANDTEST); $(BUILD_CMD)
  194. + +@target=$(RANDTEST); $(BUILD_CMD)
  195. $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
  196. - @target=$(DHTEST); $(BUILD_CMD)
  197. + +@target=$(DHTEST); $(BUILD_CMD)
  198. $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
  199. - @target=$(DSATEST); $(BUILD_CMD)
  200. + +@target=$(DSATEST); $(BUILD_CMD)
  201. $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
  202. - @target=$(METHTEST); $(BUILD_CMD)
  203. + +@target=$(METHTEST); $(BUILD_CMD)
  204. $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
  205. - @target=$(SSLTEST); $(FIPS_BUILD_CMD)
  206. + +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
  207. $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
  208. - @target=$(ENGINETEST); $(BUILD_CMD)
  209. + +@target=$(ENGINETEST); $(BUILD_CMD)
  210. $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
  211. - @target=$(EVPTEST); $(BUILD_CMD)
  212. + +@target=$(EVPTEST); $(BUILD_CMD)
  213. $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
  214. - @target=$(EVPEXTRATEST); $(BUILD_CMD)
  215. + +@target=$(EVPEXTRATEST); $(BUILD_CMD)
  216. $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
  217. - @target=$(ECDSATEST); $(BUILD_CMD)
  218. + +@target=$(ECDSATEST); $(BUILD_CMD)
  219. $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
  220. - @target=$(ECDHTEST); $(BUILD_CMD)
  221. + +@target=$(ECDHTEST); $(BUILD_CMD)
  222. $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
  223. - @target=$(IGETEST); $(BUILD_CMD)
  224. + +@target=$(IGETEST); $(BUILD_CMD)
  225. $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
  226. - @target=$(JPAKETEST); $(BUILD_CMD)
  227. + +@target=$(JPAKETEST); $(BUILD_CMD)
  228. $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
  229. - @target=$(ASN1TEST); $(BUILD_CMD)
  230. + +@target=$(ASN1TEST); $(BUILD_CMD)
  231. $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
  232. - @target=$(SRPTEST); $(BUILD_CMD)
  233. + +@target=$(SRPTEST); $(BUILD_CMD)
  234. $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
  235. - @target=$(V3NAMETEST); $(BUILD_CMD)
  236. + +@target=$(V3NAMETEST); $(BUILD_CMD)
  237. $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
  238. - @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
  239. + +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
  240. $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
  241. - @target=$(CONSTTIMETEST) $(BUILD_CMD)
  242. + +@target=$(CONSTTIMETEST) $(BUILD_CMD)
  243. #$(AESTEST).o: $(AESTEST).c
  244. # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
  245. @@ -529,7 +529,7 @@
  246. # fi
  247. dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
  248. - @target=dummytest; $(BUILD_CMD)
  249. + +@target=dummytest; $(BUILD_CMD)
  250. # DO NOT DELETE THIS LINE -- make depend depends on it.