Merge branch 'y/make-j' into 'master'

component/openssl: Fix build for make -j

Fix parallel build for openssl - out of the box it in parallel mode openssl build ~ 2 times faster, and with tuned cache and other setting ~ 3 times faster.

Please apply and thanks beforehand,
Kirill

/cc @kazuhiko

See merge request !3

component/openssl/buildout.cfg

@@ -20,9 +20,10 @@ url = https://www.openssl.org/source/openssl-1.0.1m.tar.gz
 md5sum = d143d1555d842a069cb7cc34ba745a06
 patch-binary = ${patch:location}/bin/patch
 patches =
-  ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92
-  ${:_profile_base_location_}/openssl-exlibs.patch#dfb8979460d6d75f2d23d1ea83bbb40a
-patch-options = -p0
+  ${:_profile_base_location_}/openssl-nodoc.patch#dd1345ae7ed18ccf176bc6b77c516f98
+  ${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738
+  ${:_profile_base_location_}/openssl-1.0.1m-parallel-build.patch#a1ddd93b5b296473c7446131deb31f93
+patch-options = -p1
 configure-command = ./config
 configure-options =
   -I${zlib:location}/include
@@ -33,10 +34,6 @@ configure-options =
   shared no-idea no-mdc2 no-rc5 zlib
   -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
   && make depend
-
-# it seems that parallel build sometimes fails for openssl.
-make-options =
-  -j1
 make-targets =
   all install_sw && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
 environment =

component/openssl/openssl-exlibs.patch

---- engines/ccgost/Makefile~	2010-08-24 23:46:34.000000000 +0200
-+++ engines/ccgost/Makefile	2012-03-14 10:11:46.826419864 +0100
+--- a/engines/ccgost/Makefile~	2010-08-24 23:46:34.000000000 +0200
++++ b/engines/ccgost/Makefile	2012-03-14 10:11:46.826419864 +0100
 @@ -7,6 +7,7 @@
  AR= ar r
  CFLAGS= $(INCLUDES) $(CFLAG)

component/openssl/openssl-nodoc.patch

---- Makefile	2012-01-18 14:42:28.000000000 +0100
-+++ Makefile	2012-01-24 17:43:40.000000000 +0100
+--- a/Makefile	2012-01-18 14:42:28.000000000 +0100
++++ b/Makefile	2012-01-24 17:43:40.000000000 +0100
 @@ -494,7 +494,7 @@
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)