200-parallel_build.patch 5.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184
  1. --- a/Makefile.org
  2. +++ b/Makefile.org
  3. @@ -282,17 +282,17 @@ build_libcrypto: build_crypto build_engi
  4. build_libssl: build_ssl libssl.pc
  5. build_crypto:
  6. - @dir=crypto; target=all; $(BUILD_ONE_CMD)
  7. + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
  8. build_ssl: build_crypto
  9. - @dir=ssl; target=all; $(BUILD_ONE_CMD)
  10. + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
  11. build_engines: build_crypto
  12. - @dir=engines; target=all; $(BUILD_ONE_CMD)
  13. + +@dir=engines; target=all; $(BUILD_ONE_CMD)
  14. build_apps: build_libs
  15. - @dir=apps; target=all; $(BUILD_ONE_CMD)
  16. + +@dir=apps; target=all; $(BUILD_ONE_CMD)
  17. build_tests: build_libs
  18. - @dir=test; target=all; $(BUILD_ONE_CMD)
  19. + +@dir=test; target=all; $(BUILD_ONE_CMD)
  20. build_tools: build_libs
  21. - @dir=tools; target=all; $(BUILD_ONE_CMD)
  22. + +@dir=tools; target=all; $(BUILD_ONE_CMD)
  23. all_testapps: build_libs build_testapps
  24. build_testapps:
  25. @@ -473,7 +473,7 @@ update: errors stacks util/libeay.num ut
  26. @set -e; target=update; $(RECURSIVE_BUILD_CMD)
  27. depend:
  28. - @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
  29. + +@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
  30. lint:
  31. @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
  32. @@ -535,9 +535,9 @@ dist:
  33. @$(MAKE) SDIRS='$(SDIRS)' clean
  34. @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
  35. -install: all install_sw
  36. +install: install_sw
  37. -install_sw:
  38. +install_dirs:
  39. @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  40. $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
  41. $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
  42. @@ -546,12 +546,19 @@ install_sw:
  43. $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  44. $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
  45. $(INSTALL_PREFIX)$(OPENSSLDIR)/private
  46. + @$(PERL) $(TOP)/util/mkdir-p.pl \
  47. + $(INSTALL_PREFIX)$(MANDIR)/man1 \
  48. + $(INSTALL_PREFIX)$(MANDIR)/man3 \
  49. + $(INSTALL_PREFIX)$(MANDIR)/man5 \
  50. + $(INSTALL_PREFIX)$(MANDIR)/man7
  51. +
  52. +install_sw: install_dirs
  53. @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
  54. do \
  55. (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  56. chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  57. done;
  58. - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
  59. + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
  60. @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  61. do \
  62. if [ -f "$$i" ]; then \
  63. @@ -635,12 +642,7 @@ install_html_docs:
  64. done; \
  65. done
  66. -install_docs:
  67. - @$(PERL) $(TOP)/util/mkdir-p.pl \
  68. - $(INSTALL_PREFIX)$(MANDIR)/man1 \
  69. - $(INSTALL_PREFIX)$(MANDIR)/man3 \
  70. - $(INSTALL_PREFIX)$(MANDIR)/man5 \
  71. - $(INSTALL_PREFIX)$(MANDIR)/man7
  72. +install_docs: install_dirs
  73. @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  74. here="`pwd`"; \
  75. filecase=; \
  76. --- a/Makefile.shared
  77. +++ b/Makefile.shared
  78. @@ -120,6 +120,7 @@ SYMLINK_SO= \
  79. done; \
  80. fi; \
  81. if [ -n "$$SHLIB_SOVER" ]; then \
  82. + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
  83. ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
  84. ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
  85. fi; \
  86. --- a/crypto/Makefile
  87. +++ b/crypto/Makefile
  88. @@ -85,11 +85,11 @@ testapps:
  89. @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
  90. subdirs:
  91. - @target=all; $(RECURSIVE_MAKE)
  92. + +@target=all; $(RECURSIVE_MAKE)
  93. files:
  94. $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
  95. - @target=files; $(RECURSIVE_MAKE)
  96. + +@target=files; $(RECURSIVE_MAKE)
  97. links:
  98. @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
  99. @@ -100,7 +100,7 @@ links:
  100. # lib: $(LIB): are splitted to avoid end-less loop
  101. lib: $(LIB)
  102. @touch lib
  103. -$(LIB): $(LIBOBJ)
  104. +$(LIB): $(LIBOBJ) | subdirs
  105. $(AR) $(LIB) $(LIBOBJ)
  106. test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
  107. $(RANLIB) $(LIB) || echo Never mind.
  108. @@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
  109. fi
  110. libs:
  111. - @target=lib; $(RECURSIVE_MAKE)
  112. + +@target=lib; $(RECURSIVE_MAKE)
  113. install:
  114. @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
  115. @@ -120,7 +120,7 @@ install:
  116. (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  117. chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  118. done;
  119. - @target=install; $(RECURSIVE_MAKE)
  120. + +@target=install; $(RECURSIVE_MAKE)
  121. lint:
  122. @target=lint; $(RECURSIVE_MAKE)
  123. --- a/engines/Makefile
  124. +++ b/engines/Makefile
  125. @@ -72,7 +72,7 @@ top:
  126. all: lib subdirs
  127. -lib: $(LIBOBJ)
  128. +lib: $(LIBOBJ) | subdirs
  129. @if [ -n "$(SHARED_LIBS)" ]; then \
  130. set -e; \
  131. for l in $(LIBNAMES); do \
  132. @@ -89,7 +89,7 @@ lib: $(LIBOBJ)
  133. subdirs:
  134. echo $(EDIRS)
  135. - @target=all; $(RECURSIVE_MAKE)
  136. + +@target=all; $(RECURSIVE_MAKE)
  137. files:
  138. $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
  139. @@ -128,7 +128,7 @@ install:
  140. mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
  141. done; \
  142. fi
  143. - @target=install; $(RECURSIVE_MAKE)
  144. + +@target=install; $(RECURSIVE_MAKE)
  145. tags:
  146. ctags $(SRC)
  147. --- a/test/Makefile
  148. +++ b/test/Makefile
  149. @@ -144,7 +144,7 @@ install:
  150. tags:
  151. ctags $(SRC)
  152. -tests: exe apps $(TESTS)
  153. +tests: exe $(TESTS)
  154. apps:
  155. @(cd ..; $(MAKE) DIRS=apps all)
  156. @@ -578,7 +578,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssl
  157. # fi
  158. dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
  159. - @target=dummytest; $(BUILD_CMD)
  160. + +@target=dummytest; $(BUILD_CMD)
  161. # DO NOT DELETE THIS LINE -- make depend depends on it.