Skip to contentSkip to conversation

openssl v2 with other unrecognised option patches

PATCH In review Saul Wold 2 participants 5 messages Dec 20, 2013 – Dec 21, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover openssl v2 with other unrecognised option patches

Round 2 of the openssl patch

Saul Wold (3):
openssl: use PACKAGECONFIG to disable perl bits
sqlite: remove unrecognised options: --enable-tempstore
python: fix unrecognised options: --without-cxx --with-cyclic-gc

 meta/recipes-connectivity/openssl/openssl.inc | 17 +++++++++++------
 meta/recipes-devtools/python/python.inc       |  3 +--
 meta/recipes-support/sqlite/sqlite3.inc       |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH v2 1/3 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.

---
 meta/recipes-connectivity/openssl/openssl.inc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +11 -6
index cdb1809..da19831 100644
@@ -13,9 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
 DEPENDS = "perl-native-runtime"
 
-# Adding RDEPENDS for perl scripts
-RDEPENDS_${PN}-misc +="perl"
-
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
           "
 S = "${WORKDIR}/openssl-${PV}"
@@ -41,6 +38,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
 FILES_libssl = "${libdir}/libssl.so.*"
 FILES_${PN} =+ " ${libdir}/ssl/*"
 FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
+RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
 FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
 
 # Add the openssl.cnf file to the openssl-conf package.  Make the libcrypto
@@ -157,11 +155,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"
Signature · 1 line
1.8.3.1
author
#2 lore raw

PATCH 2/3 sqlite: remove unrecognised options: --enable-tempstore

In reply to Saul Wold
---
 meta/recipes-support/sqlite/sqlite3.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-support/sqlite/sqlite3.inc +1 -1
index 064d78c..0cd2deb 100644
@@ -8,7 +8,7 @@ LICENSE = "PD"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-shared --enable-threadsafe"
-EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline --enable-tempstore"
+EXTRA_OECONF_class-native = "--enable-shared --enable-threadsafe --disable-readline"
 export config_BUILD_CC = "${BUILD_CC}"
 export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
 export config_BUILD_LIBS = "${BUILD_LDFLAGS}"
Signature · 1 line
1.8.3.1
#3 lore raw

Re: [PATCH 2/3] sqlite: remove unrecognised options: --enable-tempstore

Hi Saul,

Quoted 2 lines · On Friday 20 December 2013 10:47:27 Saul Wold wrote:

---

IMO we need more details for these option removal commits; we need to know when the option disappeared if it did in fact disappear (as opposed to having been wrong in the first place or renamed to something else).

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#4 lore raw

PATCH 3/3 python: fix unrecognised options: --without-cxx --with-cyclic-gc

In reply to Saul Wold
---
 meta/recipes-devtools/python/python.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-devtools/python/python.inc +1 -2
index fcfeda5..cecfb3a 100644
@@ -22,8 +22,7 @@ PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8"
 EXTRA_OECONF = "\
   --with-threads \
   --with-pymalloc \
-  --with-cyclic-gc \
-  --without-cxx \
+  --without-cxx-main \
   --with-signal-module \
   --enable-shared \
   --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
Signature · 1 line
1.8.3.1