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

   1 --- a/Makefile.org
   2 +++ b/Makefile.org
   3 @@ -274,17 +274,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 @@ -453,7 +453,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 @@ -531,9 +531,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 @@ -542,12 +542,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 @@ -631,12 +638,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 @@ -85,11 +85,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 "CPUID_OBJ=$(CPUID_OBJ)" 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 @@ -100,7 +100,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         test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
 122         $(RANLIB) $(LIB) || echo Never mind.
 123 @@ -111,7 +111,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 @@ -120,7 +120,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 @@ -133,7 +133,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 @@ -529,7 +529,7 @@ $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMET
 182  #      fi
 183
 184  dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
 185 -       @target=dummytest; $(BUILD_CMD)
 186 +       +@target=dummytest; $(BUILD_CMD)
 187
 188  # DO NOT DELETE THIS LINE -- make depend depends on it.
 189