package/libs/openssl/patches/200-parallel_build.patch

   1 --- a/Makefile.org
   2 +++ b/Makefile.org
   3 @@ -273,17 +273,17 @@ build_all: build_libs build_apps build_t
   4  build_libs: build_crypto build_ssl build_engines
   5
   6  build_crypto:
   7 -       @dir=crypto; target=all; $(BUILD_ONE_CMD)
   8 -build_ssl:
   9 -       @dir=ssl; target=all; $(BUILD_ONE_CMD)
  10 -build_engines:
  11 -       @dir=engines; target=all; $(BUILD_ONE_CMD)
  12 -build_apps:
  13 -       @dir=apps; target=all; $(BUILD_ONE_CMD)
  14 -build_tests:
  15 -       @dir=test; target=all; $(BUILD_ONE_CMD)
  16 -build_tools:
  17 -       @dir=tools; target=all; $(BUILD_ONE_CMD)
  18 +       +@dir=crypto; target=all; $(BUILD_ONE_CMD)
  19 +build_ssl: build_crypto
  20 +       +@dir=ssl; target=all; $(BUILD_ONE_CMD)
  21 +build_engines: build_crypto
  22 +       +@dir=engines; target=all; $(BUILD_ONE_CMD)
  23 +build_apps: build_libs
  24 +       +@dir=apps; target=all; $(BUILD_ONE_CMD)
  25 +build_tests: build_libs
  26 +       +@dir=test; target=all; $(BUILD_ONE_CMD)
  27 +build_tools: build_libs
  28 +       +@dir=tools; target=all; $(BUILD_ONE_CMD)
  29
  30  all_testapps: build_libs build_testapps
  31  build_testapps:
  32 @@ -455,7 +455,7 @@ report:
  33         @$(PERL) util/selftest.pl
  34
  35  depend:
  36 -       @set -e; target=depend; $(RECURSIVE_BUILD_CMD)
  37 +       +@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
  38
  39  lint:
  40         @set -e; target=lint; $(RECURSIVE_BUILD_CMD)
  41 @@ -533,9 +533,9 @@ dist:
  42  dist_pem_h:
  43         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  44
  45 -install: all install_sw
  46 +install: install_sw
  47
  48 -install_sw:
  49 +install_dirs:
  50         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  51                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
  52                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
  53 @@ -544,12 +544,19 @@ install_sw:
  54                 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  55                 $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
  56                 $(INSTALL_PREFIX)$(OPENSSLDIR)/private
  57 +       @$(PERL) $(TOP)/util/mkdir-p.pl \
  58 +               $(INSTALL_PREFIX)$(MANDIR)/man1 \
  59 +               $(INSTALL_PREFIX)$(MANDIR)/man3 \
  60 +               $(INSTALL_PREFIX)$(MANDIR)/man5 \
  61 +               $(INSTALL_PREFIX)$(MANDIR)/man7
  62 +
  63 +install_sw: install_dirs
  64         @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
  65         do \
  66         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
  67         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
  68         done;
  69 -       @set -e; target=install; $(RECURSIVE_BUILD_CMD)
  70 +       +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
  71         @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
  72         do \
  73                 if [ -f "$$i" ]; then \
  74 @@ -629,12 +636,7 @@ install_html_docs:
  75                 done; \
  76         done
  77
  78 -install_docs:
  79 -       @$(PERL) $(TOP)/util/mkdir-p.pl \
  80 -               $(INSTALL_PREFIX)$(MANDIR)/man1 \
  81 -               $(INSTALL_PREFIX)$(MANDIR)/man3 \
  82 -               $(INSTALL_PREFIX)$(MANDIR)/man5 \
  83 -               $(INSTALL_PREFIX)$(MANDIR)/man7
  84 +install_docs: install_dirs
  85         @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  86         here="`pwd`"; \
  87         filecase=; \
  88 --- a/Makefile.shared
  89 +++ b/Makefile.shared
  90 @@ -120,6 +120,7 @@ SYMLINK_SO= \
  91                         done; \
  92                 fi; \
  93                 if [ -n "$$SHLIB_SOVER" ]; then \
  94 +                       [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
  95                         ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
  96                           ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
  97                 fi; \
  98 --- a/crypto/Makefile
  99 +++ b/crypto/Makefile
 100 @@ -88,11 +88,11 @@ testapps:
 101         @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 102
 103  subdirs:
 104 -       @target=all; $(RECURSIVE_MAKE)
 105 +       +@target=all; $(RECURSIVE_MAKE)
 106
 107  files:
 108         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 109 -       @target=files; $(RECURSIVE_MAKE)
 110 +       +@target=files; $(RECURSIVE_MAKE)
 111
 112  links:
 113         @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
 114 @@ -103,7 +103,7 @@ links:
 115  # lib: $(LIB): are splitted to avoid end-less loop
 116  lib:   $(LIB)
 117         @touch lib
 118 -$(LIB):        $(LIBOBJ)
 119 +$(LIB):        $(LIBOBJ) | subdirs
 120         $(AR) $(LIB) $(LIBOBJ)
 121         [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
 122         $(RANLIB) $(LIB) || echo Never mind.
 123 @@ -114,7 +114,7 @@ shared: buildinf.h lib subdirs
 124         fi
 125
 126  libs:
 127 -       @target=lib; $(RECURSIVE_MAKE)
 128 +       +@target=lib; $(RECURSIVE_MAKE)
 129
 130  install:
 131         @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
 132 @@ -123,7 +123,7 @@ install:
 133         (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 134         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
 135         done;
 136 -       @target=install; $(RECURSIVE_MAKE)
 137 +       +@target=install; $(RECURSIVE_MAKE)
 138
 139  lint:
 140         @target=lint; $(RECURSIVE_MAKE)
 141 --- a/engines/Makefile
 142 +++ b/engines/Makefile
 143 @@ -72,7 +72,7 @@ top:
 144
 145  all:   lib subdirs
 146
 147 -lib:   $(LIBOBJ)
 148 +lib:   $(LIBOBJ) | subdirs
 149         @if [ -n "$(SHARED_LIBS)" ]; then \
 150                 set -e; \
 151                 for l in $(LIBNAMES); do \
 152 @@ -89,7 +89,7 @@ lib:  $(LIBOBJ)
 153
 154  subdirs:
 155         echo $(EDIRS)
 156 -       @target=all; $(RECURSIVE_MAKE)
 157 +       +@target=all; $(RECURSIVE_MAKE)
 158
 159  files:
 160         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 161 @@ -128,7 +128,7 @@ install:
 162                           mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
 163                 done; \
 164         fi
 165 -       @target=install; $(RECURSIVE_MAKE)
 166 +       +@target=install; $(RECURSIVE_MAKE)
 167
 168  tags:
 169         ctags $(SRC)
 170 --- a/test/Makefile
 171 +++ b/test/Makefile
 172 @@ -124,7 +124,7 @@ install:
 173  tags:
 174         ctags $(SRC)
 175
 176 -tests: exe apps $(TESTS)
 177 +tests: exe $(TESTS)
 178
 179  apps:
 180         @(cd ..; $(MAKE) DIRS=apps all)
 181 @@ -365,109 +365,109 @@ FIPS_BUILD_CMD=shlib_target=; if [ -n "$
 182                 link_app.$${shlib_target}
 183
 184  $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
 185 -       @target=$(RSATEST); $(BUILD_CMD)
 186 +       +@target=$(RSATEST); $(BUILD_CMD)
 187
 188  $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
 189 -       @target=$(BNTEST); $(BUILD_CMD)
 190 +       +@target=$(BNTEST); $(BUILD_CMD)
 191
 192  $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
 193 -       @target=$(ECTEST); $(BUILD_CMD)
 194 +       +@target=$(ECTEST); $(BUILD_CMD)
 195
 196  $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
 197 -       @target=$(EXPTEST); $(BUILD_CMD)
 198 +       +@target=$(EXPTEST); $(BUILD_CMD)
 199
 200  $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
 201 -       @target=$(IDEATEST); $(BUILD_CMD)
 202 +       +@target=$(IDEATEST); $(BUILD_CMD)
 203
 204  $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
 205 -       @target=$(MD2TEST); $(BUILD_CMD)
 206 +       +@target=$(MD2TEST); $(BUILD_CMD)
 207
 208  $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
 209 -       @target=$(SHATEST); $(BUILD_CMD)
 210 +       +@target=$(SHATEST); $(BUILD_CMD)
 211
 212  $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
 213 -       @target=$(SHA1TEST); $(BUILD_CMD)
 214 +       +@target=$(SHA1TEST); $(BUILD_CMD)
 215
 216  $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
 217 -       @target=$(SHA256TEST); $(BUILD_CMD)
 218 +       +@target=$(SHA256TEST); $(BUILD_CMD)
 219
 220  $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
 221 -       @target=$(SHA512TEST); $(BUILD_CMD)
 222 +       +@target=$(SHA512TEST); $(BUILD_CMD)
 223
 224  $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
 225 -       @target=$(RMDTEST); $(BUILD_CMD)
 226 +       +@target=$(RMDTEST); $(BUILD_CMD)
 227
 228  $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
 229 -       @target=$(MDC2TEST); $(BUILD_CMD)
 230 +       +@target=$(MDC2TEST); $(BUILD_CMD)
 231
 232  $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
 233 -       @target=$(MD4TEST); $(BUILD_CMD)
 234 +       +@target=$(MD4TEST); $(BUILD_CMD)
 235
 236  $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
 237 -       @target=$(MD5TEST); $(BUILD_CMD)
 238 +       +@target=$(MD5TEST); $(BUILD_CMD)
 239
 240  $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
 241 -       @target=$(HMACTEST); $(BUILD_CMD)
 242 +       +@target=$(HMACTEST); $(BUILD_CMD)
 243
 244  $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
 245 -       @target=$(WPTEST); $(BUILD_CMD)
 246 +       +@target=$(WPTEST); $(BUILD_CMD)
 247
 248  $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
 249 -       @target=$(RC2TEST); $(BUILD_CMD)
 250 +       +@target=$(RC2TEST); $(BUILD_CMD)
 251
 252  $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
 253 -       @target=$(BFTEST); $(BUILD_CMD)
 254 +       +@target=$(BFTEST); $(BUILD_CMD)
 255
 256  $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
 257 -       @target=$(CASTTEST); $(BUILD_CMD)
 258 +       +@target=$(CASTTEST); $(BUILD_CMD)
 259
 260  $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
 261 -       @target=$(RC4TEST); $(BUILD_CMD)
 262 +       +@target=$(RC4TEST); $(BUILD_CMD)
 263
 264  $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
 265 -       @target=$(RC5TEST); $(BUILD_CMD)
 266 +       +@target=$(RC5TEST); $(BUILD_CMD)
 267
 268  $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
 269 -       @target=$(DESTEST); $(BUILD_CMD)
 270 +       +@target=$(DESTEST); $(BUILD_CMD)
 271
 272  $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
 273 -       @target=$(RANDTEST); $(BUILD_CMD)
 274 +       +@target=$(RANDTEST); $(BUILD_CMD)
 275
 276  $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
 277 -       @target=$(DHTEST); $(BUILD_CMD)
 278 +       +@target=$(DHTEST); $(BUILD_CMD)
 279
 280  $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
 281 -       @target=$(DSATEST); $(BUILD_CMD)
 282 +       +@target=$(DSATEST); $(BUILD_CMD)
 283
 284  $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
 285 -       @target=$(METHTEST); $(BUILD_CMD)
 286 +       +@target=$(METHTEST); $(BUILD_CMD)
 287
 288  $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
 289 -       @target=$(SSLTEST); $(FIPS_BUILD_CMD)
 290 +       +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
 291
 292  $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
 293 -       @target=$(ENGINETEST); $(BUILD_CMD)
 294 +       +@target=$(ENGINETEST); $(BUILD_CMD)
 295
 296  $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
 297 -       @target=$(EVPTEST); $(BUILD_CMD)
 298 +       +@target=$(EVPTEST); $(BUILD_CMD)
 299
 300  $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
 301 -       @target=$(ECDSATEST); $(BUILD_CMD)
 302 +       +@target=$(ECDSATEST); $(BUILD_CMD)
 303
 304  $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
 305 -       @target=$(ECDHTEST); $(BUILD_CMD)
 306 +       +@target=$(ECDHTEST); $(BUILD_CMD)
 307
 308  $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
 309 -       @target=$(IGETEST); $(BUILD_CMD)
 310 +       +@target=$(IGETEST); $(BUILD_CMD)
 311
 312  $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
 313 -       @target=$(JPAKETEST); $(BUILD_CMD)
 314 +       +@target=$(JPAKETEST); $(BUILD_CMD)
 315
 316  $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
 317 -       @target=$(ASN1TEST); $(BUILD_CMD)
 318 +       +@target=$(ASN1TEST); $(BUILD_CMD)
 319
 320  $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
 321 -       @target=$(SRPTEST); $(BUILD_CMD)
 322 +       +@target=$(SRPTEST); $(BUILD_CMD)
 323
 324  #$(AESTEST).o: $(AESTEST).c
 325  #      $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
 326 @@ -480,7 +480,7 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLI
 327  #      fi
 328
 329  dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
 330 -       @target=dummytest; $(BUILD_CMD)
 331 +       +@target=dummytest; $(BUILD_CMD)
 332
 333  # DO NOT DELETE THIS LINE -- make depend depends on it.
 334