[oe-commits] Kang Kai : libnet-ssleay-perl: avoid host contamination

git at git.openembedded.org git at git.openembedded.org
Tue Dec 9 10:53:45 UTC 2014


Module: meta-openembedded.git
Branch: master-next
Commit: 5413dbaf5421b4d848b669b8e07da02f0e877c63
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5413dbaf5421b4d848b669b8e07da02f0e877c63

Author: Kang Kai <kai.kang at windriver.com>
Date:   Mon Dec  1 15:32:44 2014 +0800

libnet-ssleay-perl: avoid host contamination

Check the configure log, libnet-ssleay-perl uses host's openssl:

*** Found OpenSSL-1.0.1 installed in /usr

Export OPENSSL_PREFIX to find the native openssl to use.

Replace library pathes '/lib', '/usr/lib' and header path with correct
staging pathes at same time.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
index 63594b9..f6c4b8b 100644
--- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
+++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.65.bb
@@ -28,12 +28,16 @@ S = "${WORKDIR}/Net-SSLeay-${PV}"
 
 inherit cpan ptest
 
-EXTRA_CPANFLAGS = "LIBS='-L=${libdir} -L=${base_libdir}' \
-                   INC=-I=${includedir} \
+EXTRA_CPANFLAGS = "LIBS='-L=${STAGING_LIBDIR} -L=${STAGING_BASELIBDIR}' \
+                   INC=-I=${STAGING_INCDIR} \
                    'EXTRALIBS=-lssl -lcrypto -lz' \
                    'LDLOADLIBS=-lssl -lcrypto -lz' \
                   "
 
+do_configure_prepend() {
+    export OPENSSL_PREFIX=${STAGING_DIR_NATIVE}${prefix_native}
+}
+
 do_install_ptest() {
     cp -r ${B}/t ${D}${PTEST_PATH}
 }



More information about the Openembedded-commits mailing list