From: Jackie Huang <jackie.huang@windriver.com>
Date: Tue, 19 Aug 2014 01:44:38 +0000 (-0400)
Subject: openssl: add DEPENDS on openssl-native for rehash
X-Git-Tag: 2015-4~1861
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9705586b6eca157e8f8fd6071f489a49bf1db181;p=openembedded-core.git

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.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
 DEPENDS = "perl-native-runtime"
+DEPENDS_append_class-target = " openssl-native"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
           "
@@ -137,6 +138,10 @@ do_configure () {
 	perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl --libdir=`basename ${libdir}` $target
 }
 
+do_compile_prepend_class-target () {
+    sed -i 's/\((OPENSSL=\)".*"/\1"openssl"/' Makefile
+}
+
 do_compile () {
 	oe_runmake
 }