src/patches/openssl-1.0.1e-fix_parallel_build-1.patch

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