[PATCH v2 1/1] apr-util: add ldap crypto and sqlite3 to PACKAGECONFIG
From: Ioan-Adrian Ratiu <hidden>
Date: 2016-01-29 14:06:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
Enable apr-util's cryptographic routines so that the apache2 package can encrypt session data. Also add sqlite3 and ldap modules, disabled by default. Signed-off-by: Adam Chappell <redacted> Signed-off-by: Jacob Champion <redacted> Signed-off-by: Ioan-Adrian Ratiu <redacted> Acked-by: Ken Sharp <redacted> --- meta/recipes-support/apr/apr-util_1.5.4.bb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb
index 6856db9..f2a7d96 100644
--- a/meta/recipes-support/apr/apr-util_1.5.4.bb
+++ b/meta/recipes-support/apr/apr-util_1.5.4.bb@@ -24,7 +24,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-dbm=gdbm \ --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ - --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${prefix}"
@@ -66,9 +65,17 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la" -FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" +PACKAGECONFIG ??= "crypto" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto" +PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" + +FILES_${PN} += "${libdir}/apr-util-1/lib*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/aprutil.exp \ + ${libdir}/apr-util-1/lib*${SOLIBSDEV} \ + ${libdir}/apr-util-1/apr_dbm_gdbm*${SOLIBSDEV} \ + ${libdir}/apr-util-1/*.la" +FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" inherit ptest
--
2.7.0