diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-08-18 21:44:38 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-23 09:26:10 +0100 |
commit | cdb84ea0069b56df82c51d830cb9d72c82221940 (patch) | |
tree | a1a30dcc9f860a3a983f1f612244e9d6807c1f8d /meta/recipes-connectivity/openssl | |
parent | 87c748ca96c1127b9dcf8bf3990d77ab74d776a5 (diff) | |
download | poky-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/openssl')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index a99953e4bc..b63d164990 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -9,6 +9,7 @@ LICENSE = "openssl" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" |
10 | 10 | ||
11 | DEPENDS = "perl-native-runtime" | 11 | DEPENDS = "perl-native-runtime" |
12 | DEPENDS_append_class-target = " openssl-native" | ||
12 | 13 | ||
13 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | 14 | SRC_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 | ||
141 | do_compile_prepend_class-target () { | ||
142 | sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile | ||
143 | } | ||
144 | |||
140 | do_compile () { | 145 | do_compile () { |
141 | oe_runmake | 146 | oe_runmake |
142 | } | 147 | } |