summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-06-03 00:56:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-06-03 00:56:57 +0200
commitac867ac124749795aac3a5c38381f4bd18c2470c (patch)
tree61f73ffea49ddb7654cc3e24db6d3fe8f8e74363 /patches
parentee98e0bd121d71c7a63c030f3eb9d6762c933283 (diff)
downloadptxdist-ac867ac124749795aac3a5c38381f4bd18c2470c.tar.gz
ptxdist-ac867ac124749795aac3a5c38381f4bd18c2470c.tar.xz
openssl: another parallel build dependency fix
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/openssl-1.0.1m/0101-fix-parallel-building.patch15
1 files changed, 11 insertions, 4 deletions
diff --git a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch b/patches/openssl-1.0.1m/0101-fix-parallel-building.patch
index 46832e1d6..bd00669af 100644
--- a/patches/openssl-1.0.1m/0101-fix-parallel-building.patch
+++ b/patches/openssl-1.0.1m/0101-fix-parallel-building.patch
@@ -4,18 +4,25 @@ Subject: [PATCH] fix parallel building
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
- Makefile.org | 22 +++++++++++-----------
+ Makefile.org | 28 +++++++++++++++++-----------
crypto/Makefile | 4 ++--
engines/Makefile | 4 ++--
- 3 files changed, 15 insertions(+), 15 deletions(-)
+ 3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/Makefile.org b/Makefile.org
-index 5117a0ef9c0b..fac45852adc4 100644
+index 5117a0ef9c0b..265ecd559e98 100644
--- a/Makefile.org
+++ b/Makefile.org
-@@ -273,17 +273,17 @@ build_all: build_libs build_apps build_tests build_tools
+@@ -272,18 +272,24 @@ build_all: build_libs build_apps build_tests build_tools
+
build_libs: build_crypto build_ssl build_engines
++ifeq ($(SHARED_LIBS),)
++build_ssl: build_engines
++else
++build_engines: build_ssl
++endif
++
build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
-build_ssl: