summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-02-17 07:16:02 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-02-18 01:25:22 (GMT)
commit3810796ee371c8b1548f5ba75ff55299f37d0254 (patch)
tree5961b4a798541fa983cc0bed07273c52a36abed4 /meta/recipes-connectivity/openssl
parentc35d91062f557d46625eb471cf1edf2c4d95b1b8 (diff)
downloadpoky-3810796ee371c8b1548f5ba75ff55299f37d0254.tar.gz
openssl: fix parallel make
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch18
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc6
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8p.bb2
3 files changed, 22 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
new file mode 100644
index 0000000..60fab9d
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl-0.9.8p/parallel-make-fix.patch
@@ -0,0 +1,18 @@
1fix the parallel build regarding shared libraries.
2
3Signed-off-by: Qing He <qing.he@intel.com>
4
5diff --git a/Makefile.org b/Makefile.org
6index 2fb0309..8bec3d0 100644
7--- a/Makefile.org
8+++ b/Makefile.org
9@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
10 build_testapps:
11 @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
12
13+libcrypto.a: build_crypto
14+libssl.a: build_ssl
15+
16 build_shared: $(SHARED_LIBS)
17 libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
18 @if [ "$(SHLIB_TARGET)" != "" ]; then \
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index f054c26..68b3d7b 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=83d26c69f6f0172ee7f795790424b453"
10 10
11DEPENDS = "perl-native" 11DEPENDS = "perl-native"
12 12
13SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz" 13SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
14 file://parallel-make-fix.patch \
15 "
14S = "${WORKDIR}/openssl-${PV}" 16S = "${WORKDIR}/openssl-${PV}"
15 17
16AR_append = " r" 18AR_append = " r"
@@ -29,8 +31,6 @@ export DIRS = "crypto ssl apps"
29export EX_LIBS = "-lgcc -ldl" 31export EX_LIBS = "-lgcc -ldl"
30export AS = "${CC} -c" 32export AS = "${CC} -c"
31 33
32PARALLEL_MAKE = ""
33
34inherit pkgconfig siteinfo 34inherit pkgconfig siteinfo
35 35
36PACKAGES =+ "libcrypto libssl" 36PACKAGES =+ "libcrypto libssl"
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
index 283b82a..f42b3cb 100644
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
+++ b/meta/recipes-connectivity/openssl/openssl_0.9.8p.bb
@@ -1,6 +1,6 @@
1require openssl.inc 1require openssl.inc
2 2
3PR = "r2" 3PR = "r3"
4SRC_URI += "file://debian/ca.patch \ 4SRC_URI += "file://debian/ca.patch \
5 file://debian/config-hurd.patch;apply=no \ 5 file://debian/config-hurd.patch;apply=no \
6 file://debian/debian-targets.patch \ 6 file://debian/debian-targets.patch \