summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-08-19 01:44:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 08:26:10 (GMT)
commitcdb84ea0069b56df82c51d830cb9d72c82221940 (patch)
treea1a30dcc9f860a3a983f1f612244e9d6807c1f8d /meta/recipes-connectivity
parent87c748ca96c1127b9dcf8bf3990d77ab74d776a5 (diff)
downloadpoky-cdb84ea0069b56df82c51d830cb9d72c82221940.tar.gz
openssl: add DEPENDS on openssl-native for rehash
'make rehash' used the compiled openssl to get hash value for files, it always failed when cross compiling: /path/to/openssl/1.0.1i-r0/openssl-1.0.1i/util/shlib_wrap.sh: line 96: /path/to/openssl/1.0.1i-r0/openssl-1.0.1i/util/../apps/openssl: cannot execute binary file so add DEPENDS on openssl-native for target package and use it instead of the one compiled from target package. (From OE-Core rev: 9705586b6eca157e8f8fd6071f489a49bf1db181) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index a99953e..b63d164 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -9,6 +9,7 @@ LICENSE = "openssl"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
10 10
11DEPENDS = "perl-native-runtime" 11DEPENDS = "perl-native-runtime"
12DEPENDS_append_class-target = " openssl-native"
12 13
13SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 14SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
14 " 15 "
@@ -137,6 +138,10 @@ do_configure () {
137 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target 138 perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target
138} 139}
139 140
141do_compile_prepend_class-target () {
142 sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
143}
144
140do_compile () { 145do_compile () {
141 oe_runmake 146 oe_runmake
142} 147}