summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc11
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 128211511b..0c7e192920 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -33,12 +33,12 @@ EXTRA_OEMAKE = "-e MAKEFLAGS="
33inherit pkgconfig siteinfo multilib_header ptest 33inherit pkgconfig siteinfo multilib_header ptest
34 34
35PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" 35PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
36FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}" 36FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
37FILES_libssl = "${libdir}/libssl.so.*" 37FILES_libssl = "${libdir}/libssl.so.*"
38FILES_${PN} =+ " ${libdir}/ssl/*" 38FILES_${PN} =+ " ${libdir}/ssl/*"
39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" 39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 41FILES_${PN}-dev += "${libdir}/libcrypto${SOLIBSDEV}"
42 42
43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
44# package RRECOMMENDS on this package. This will enable the configuration 44# package RRECOMMENDS on this package. This will enable the configuration
@@ -166,13 +166,6 @@ do_install () {
166 oe_libinstall -so libcrypto ${D}${libdir} 166 oe_libinstall -so libcrypto ${D}${libdir}
167 oe_libinstall -so libssl ${D}${libdir} 167 oe_libinstall -so libssl ${D}${libdir}
168 168
169 # Moving libcrypto to /lib
170 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
171 mkdir -p ${D}/${base_libdir}/
172 mv ${D}${libdir}/libcrypto* ${D}${base_libdir}/
173 sed -i s#libdir=\$\{exec_prefix\}\/lib#libdir=${base_libdir}# ${D}/${libdir}/pkgconfig/libcrypto.pc
174 fi
175
176 install -d ${D}${includedir} 169 install -d ${D}${includedir}
177 cp --dereference -R include/openssl ${D}${includedir} 170 cp --dereference -R include/openssl ${D}${includedir}
178 171