From patchwork Thu Feb 9 17:44:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] openssl: Move libcrypto to base_libdir Date: Thu, 09 Feb 2012 17:44:40 -0000 From: Andrei Gherzan X-Patchwork-Id: 21047 Message-Id: <1328809480-13730-1-git-send-email-andrei@gherzan.ro> To: openembedded-core@lists.openembedded.org This fix is for dhclient. It needs libcrypto at runtime and if libcrypto is in libdir, it's path can be inaccessible on systems where /usr is on nfs for example or dhclient is needed before /usr is mounted. Signed-off-by: Andrei Gherzan --- meta/recipes-connectivity/openssl/openssl.inc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 771f146..45a6422 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -36,10 +36,11 @@ export AS = "${CC} -c" inherit pkgconfig siteinfo PACKAGES =+ "libcrypto libssl ${PN}-misc" -FILES_libcrypto = "${libdir}/libcrypto.so.*" +FILES_libcrypto = "${base_libdir}/libcrypto.so.*" FILES_libssl = "${libdir}/libssl.so.*" FILES_${PN} =+ " ${libdir}/ssl/*" FILES_${PN}-misc = "${libdir}/ssl/misc ${libdir}/ssl/openssl.cnf" +FILES_${PN}-dev += "${base_libdir}/libcrypto.so" do_configure_prepend_darwin () { sed -i -e '/version-script=openssl\.ld/d' Configure @@ -132,6 +133,10 @@ do_install () { oe_libinstall -so libcrypto ${D}${libdir} oe_libinstall -so libssl ${D}${libdir} + # Moving libcrypto to /usr + mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/ + sed -i s/usr// ${D}/${libdir}/pkgconfig/libcrypto.pc + install -d ${D}${includedir} cp --dereference -R include/openssl ${D}${includedir} sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl