summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-03-15 15:13:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:26 +0000
commit9aa27fe001d34e491235273f454c38b9ba1c60a4 (patch)
treeda3a3676dc402ca95814528612e54a1f88829869 /meta/recipes-connectivity/openssl
parent370419edca7ae5a607c70e0b48e9ad72012b71af (diff)
downloadpoky-9aa27fe001d34e491235273f454c38b9ba1c60a4.tar.gz
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. (From OE-Core rev: 0be2ab32f690a2fcba0e821abe11460958bbc6dc) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-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