openssl: don't move libcrypto to base_libdir
v2 cover openssl: don't move libcrypto to base_libdir
Changes since V1:
Rebased against latest master
The following changes since commit 300f858ba07c938427ccd05a3d7220027a03d461:
local.conf.sample: Disable prelink by default (2016-03-13 22:08:55 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/openssl-libcrypto
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/openssl-libcrypto
Chen Qi (1):
openssl: don't move libcrypto to base_libdir
meta/recipes-connectivity/openssl/openssl.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Signature · 1 line
1.9.1
PATCH v2 1/1 openssl: don't move libcrypto to base_libdir
For now, if 'openssl' is enabled for ntp, ntp would still be built without openssl & libcrypto. This is because that ntp thinks openssl and libcrypto locates under the same directory.
This patch removes the codes of moving libcrypto to base_libdir.
--- meta/recipes-connectivity/openssl/openssl.inc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +2 -9
@@ -33,12 +33,12 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" inherit pkgconfig siteinfo multilib_header ptest PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" -FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" +FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" FILES_libssl = "${libdir}/libssl.so.*" FILES_${PN} =+ " ${libdir}/ssl/*" FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" -FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" +FILES_${PN}-dev += "${libdir}/libcrypto${SOLIBSDEV}" # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto # package RRECOMMENDS on this package. This will enable the configuration
@@ -166,13 +166,6 @@ do_install () { oe_libinstall -so libcrypto ${D}${libdir} oe_libinstall -so libssl ${D}${libdir} - # Moving libcrypto to /lib - if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then - mkdir -p ${D}/${base_libdir}/ - mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/ - sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc - fi - install -d ${D}${includedir} cp --dereference -R include/openssl ${D}${includedir}
Signature · 1 line
1.9.1