From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits
Date: Thu, 19 Dec 2013 22:41:07 -0800 [thread overview]
Message-ID: <1387521668-26329-4-git-send-email-sgw@linux.intel.com> (raw)
In-Reply-To: <1387521668-26329-1-git-send-email-sgw@linux.intel.com>
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.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/openssl/openssl.inc | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index cdb1809..c58c99f 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
DEPENDS = "perl-native-runtime"
-# Adding RDEPENDS for perl scripts
-RDEPENDS_${PN}-misc +="perl"
+PACKAGECONFIG[perl] = ",,,perl"
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
"
@@ -157,11 +156,18 @@ do_install () {
install -d ${D}${includedir}
cp --dereference -R include/openssl ${D}${includedir}
- sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
oe_multilib_header openssl/opensslconf.h
- # The c_rehash utility isn't installed by the normal installation process.
- install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
+ if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
+ install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
+ sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
+ sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
+ sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget
+ # The c_rehash utility isn't installed by the normal installation process.
+ else
+ rm -f ${D}${bindir}/c_rehash
+ rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget
+ fi
}
BBCLASSEXTEND = "native nativesdk"
--
1.8.3.1
next prev parent reply other threads:[~2013-12-20 6:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 6:41 [PATCH 0/4] Misc Fixes Saul Wold
2013-12-20 6:41 ` [PATCH 1/4] harfbuzz: Allow PACKAGECONFIG to be overridden Saul Wold
2013-12-20 6:41 ` [PATCH 2/4] beecrypt: " Saul Wold
2013-12-20 6:41 ` Saul Wold [this message]
2013-12-20 9:36 ` [PATCH 3/4] openssl: use PACKAGECONFIG to disable perl bits Martin Jansa
2013-12-20 6:41 ` [PATCH 4/4] util-linux: remove non PN based -dev packages Saul Wold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387521668-26329-4-git-send-email-sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox