summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-12-20 10:47:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-21 17:22:39 +0000
commit85ac39431a549e0e6a94aa8cba6e8428a8a8758d (patch)
tree1c9579f9e9b52c0d1d69a18e459ade9418b0a6ad /meta/recipes-connectivity/openssl
parent405c322c724cf9282dc558bb80dd0219f1029cca (diff)
downloadpoky-85ac39431a549e0e6a94aa8cba6e8428a8a8758d.tar.gz
openssl: use PACKAGECONFIG to disable perl bits
Adding perl to the RDEPENDS caused a performance hit to the overall build time since this was the only package that depended on perl. The openssl-misc package is not installed by default so use a PACKAGECONFIG which can be overridden to allow the perl scripts along with perl to be installed. (From OE-Core rev: 421e927bd453259f4b3cdbd1676f6e12f97bf34f) Signed-off-by: Saul Wold <sgw@linux.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.inc19
1 files changed, 13 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index cdb1809339..373d329460 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -13,13 +13,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
13 13
14DEPENDS = "perl-native-runtime" 14DEPENDS = "perl-native-runtime"
15 15
16# Adding RDEPENDS for perl scripts
17RDEPENDS_${PN}-misc +="perl"
18
19SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
20 " 17 "
21S = "${WORKDIR}/openssl-${PV}" 18S = "${WORKDIR}/openssl-${PV}"
22 19
20PACKAGECONFIG[perl] = ",,,"
21
23AR_append = " r" 22AR_append = " r"
24# Avoid binaries being marked as requiring an executable stack since it 23# Avoid binaries being marked as requiring an executable stack since it
25# doesn't(which causes and this causes issues with SELinux 24# doesn't(which causes and this causes issues with SELinux
@@ -41,6 +40,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
41FILES_libssl = "${libdir}/libssl.so.*" 40FILES_libssl = "${libdir}/libssl.so.*"
42FILES_${PN} =+ " ${libdir}/ssl/*" 41FILES_${PN} =+ " ${libdir}/ssl/*"
43FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" 42FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
43RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
44FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 44FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
45 45
46# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 46# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -157,11 +157,18 @@ do_install () {
157 157
158 install -d ${D}${includedir} 158 install -d ${D}${includedir}
159 cp --dereference -R include/openssl ${D}${includedir} 159 cp --dereference -R include/openssl ${D}${includedir}
160 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
161 160
162 oe_multilib_header openssl/opensslconf.h 161 oe_multilib_header openssl/opensslconf.h
163 # The c_rehash utility isn't installed by the normal installation process. 162 if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
164 install -m 0755 ${S}/tools/c_rehash ${D}${bindir} 163 install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
164 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
165 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
166 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
167 # The c_rehash utility isn't installed by the normal installation process.
168 else
169 rm -f ${D}${bindir}/c_rehash
170 rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
171 fi
165} 172}
166 173
167BBCLASSEXTEND = "native nativesdk" 174BBCLASSEXTEND = "native nativesdk"