summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch22
-rw-r--r--meta-oe/recipes-connectivity/openssl/openssl_1.0.0d.bb3
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 0000000000..b319c62f42
--- /dev/null
+++ b/meta-oe/recipes-connectivity/openssl/openssl-1.0.0d/openssl-fix-link.patch
@@ -0,0 +1,22 @@
1Upstream-Status: Pending
2
3fix the parallel build regarding shared libraries.
4
5Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
6
7Index: openssl-1.0.0d/Makefile.org
8===================================================================
9--- openssl-1.0.0d.orig/Makefile.org 2011-09-01 17:03:59.000000000 +0400
10+++ openssl-1.0.0d/Makefile.org 2011-09-01 17:12:24.000000000 +0400
11@@ -246,9 +246,9 @@
12 @dir=crypto; target=all; $(BUILD_ONE_CMD)
13 build_ssl:
14 @dir=ssl; target=all; $(BUILD_ONE_CMD)
15-build_engines:
16+build_engines: build_crypto
17 @dir=engines; target=all; $(BUILD_ONE_CMD)
18-build_apps:
19+build_apps: build_crypto
20 @dir=apps; target=all; $(BUILD_ONE_CMD)
21 build_tests:
22 @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 73c8df5352..89b8615999 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"
6 6
7CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" 7CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
8 8
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.1"
10 10
11LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
12 12
@@ -22,6 +22,7 @@ SRC_URI += "file://configure-targets.patch \
22 file://shared-libs.patch \ 22 file://shared-libs.patch \
23 file://oe-ldflags.patch \ 23 file://oe-ldflags.patch \
24 file://engines-install-in-libdir-ssl.patch \ 24 file://engines-install-in-libdir-ssl.patch \
25 file://openssl-fix-link.patch \
25 file://debian/version-script.patch \ 26 file://debian/version-script.patch \
26 file://debian/pic.patch \ 27 file://debian/pic.patch \
27 file://debian/c_rehash-compat.patch \ 28 file://debian/c_rehash-compat.patch \