[oe-commits] lumag : openssl: fix parallel builds

[git version control]

Module: meta-openembedded.git
Branch: master
Commit: c434bc4f65fc06ad2fe02096f54b20a23a1ef303
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c434bc4f65fc06ad2fe02096f54b20a23a1ef303

Author: lumag <dbaryshkov at gmail.com>
Date:   Sun Sep  4 02:26:17 2011 +0000

openssl: fix parallel builds

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../openssl/openssl-1.0.0d/openssl-fix-link.patch  |   22 ++++++++++++++++++++
 .../recipes-connectivity/openssl/openssl_1.0.0d.bb |    3 +-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch
new file mode 100644
index 0000000..b319c62
--- /dev/null
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Pending
+
+fix the parallel build regarding shared libraries.
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
+
+Index: openssl-1.0.0d/Makefile.org
+===================================================================
+--- openssl-1.0.0d.orig/Makefile.org	2011-09-01 17:03:59.000000000 +0400
++++ openssl-1.0.0d/Makefile.org	2011-09-01 17:12:24.000000000 +0400
+@@ -246,9 +246,9 @@
+	@dir=crypto; target=all; $(BUILD_ONE_CMD)
+ build_ssl:
+	@dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
++build_engines: build_crypto
+	@dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
++build_apps: build_crypto
+	@dir=apps; target=all; $(BUILD_ONE_CMD)
+ build_tests:
+	@dir=test; target=all; $(BUILD_ONE_CMD)
diff --git a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
index 73c8df5..89b8615 100644
--- a/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
+++ b/meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
 
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
@@ -22,6 +22,7 @@ SRC_URI += "file://configure-targets.patch \
             file://shared-libs.patch \
             file://oe-ldflags.patch \
             file://engines-install-in-libdir-ssl.patch \
+            file://openssl-fix-link.patch \
             file://debian/version-script.patch \
             file://debian/pic.patch \
             file://debian/c_rehash-compat.patch \