summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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 91770a59dd..e5a6848937 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
@@ -154,11 +154,18 @@ do_install () {
154 154
155 install -d ${D}${includedir} 155 install -d ${D}${includedir}
156 cp --dereference -R include/openssl ${D}${includedir} 156 cp --dereference -R include/openssl ${D}${includedir}
157 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
158 157
159 oe_multilib_header openssl/opensslconf.h 158 oe_multilib_header openssl/opensslconf.h
160 # The c_rehash utility isn't installed by the normal installation process. 159 if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
161 install -m 0755 ${S}/tools/c_rehash ${D}${bindir} 160 install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
161 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
162 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
163 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
164 # The c_rehash utility isn't installed by the normal installation process.
165 else
166 rm -f ${D}${bindir}/c_rehash
167 rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
168 fi
162} 169}
163 170
164BBCLASSEXTEND = "native nativesdk" 171BBCLASSEXTEND = "native nativesdk"