summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2020-12-21 12:00:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-21 22:29:57 +0000
commit23999cdaace744c9b82272ff648a7e262145817c (patch)
tree616b3d56571732a729dd5ab35edd0ab97bb4835d /meta/recipes-support/apr
parenta8af557839b5002536ab79ee45ab1b28cb3b27d8 (diff)
downloadpoky-23999cdaace744c9b82272ff648a7e262145817c.tar.gz
apr-util: Only specify --with-dbm=gdbm if gdbm support is enabled
Support for gdbm was made optional in 3260ad9e, but it was still being used unconditionally. (From OE-Core rev: 09d303ca295dc27874c72b30c37a64d1fdf4c5c0) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r--meta/recipes-support/apr/apr-util_1.6.1.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.1.bb
index 0dd8f025e8..f7d827a1d8 100644
--- a/meta/recipes-support/apr/apr-util_1.6.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.6.1.bb
@@ -19,10 +19,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
19SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" 19SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f"
20SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" 20SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459"
21 21
22EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 22EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
23 --without-odbc \ 23 --without-odbc \
24 --without-pgsql \ 24 --without-pgsql \
25 --with-dbm=gdbm \
26 --without-sqlite2 \ 25 --without-sqlite2 \
27 --with-expat=${STAGING_DIR_HOST}${prefix}" 26 --with-expat=${STAGING_DIR_HOST}${prefix}"
28 27
@@ -69,7 +68,7 @@ PACKAGECONFIG ??= "crypto gdbm"
69PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" 68PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
70PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" 69PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl"
71PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" 70PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3"
72PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" 71PACKAGECONFIG[gdbm] = "--with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm"
73 72
74#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}
75FILES_${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}"