summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2016-02-04 14:32:53 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:02 +0000
commit9d86b268f26609366e42360a81c39d38f7a1eb99 (patch)
treec645544480aa1bab614405e355f9e1360690dfb6
parentd8d2f573f09b4e4acee924dadce2bcd9b594e94b (diff)
downloadpoky-9d86b268f26609366e42360a81c39d38f7a1eb99.tar.gz
apr-util: add ldap crypto and sqlite3 to PACKAGECONFIG
Enable apr-util's cryptographic routines so that the apache2 package can encrypt session data. Also add sqlite3 and ldap modules, disabled by default. (From OE-Core rev: c8be8890e0a9c9d5f1532c4ee4fe9a346ed3ca5b) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr-util_1.5.4.bb6
1 files changed, 5 insertions, 1 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 381daaddf3..28962bd0ef 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 \
24 --with-dbm=gdbm \ 24 --with-dbm=gdbm \
25 --with-gdbm=${STAGING_DIR_HOST}${prefix} \ 25 --with-gdbm=${STAGING_DIR_HOST}${prefix} \
26 --without-sqlite2 \ 26 --without-sqlite2 \
27 --without-sqlite3 \
28 --with-expat=${STAGING_DIR_HOST}${prefix}" 27 --with-expat=${STAGING_DIR_HOST}${prefix}"
29 28
30 29
@@ -66,6 +65,11 @@ do_install_append_class-target() {
66 -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config 65 -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config
67} 66}
68 67
68PACKAGECONFIG ??= "crypto"
69PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
70PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl"
71PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3"
72
69#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} 73#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN}
70FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" 74FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}"
71FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" 75FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la"