diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-12-21 12:00:12 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-09 09:17:16 +0000 |
| commit | 66668375f5817adac80e96bfb3972db97d0b8482 (patch) | |
| tree | 2f36813bd02df56d80e6bb86159a65732aed9efe /meta | |
| parent | 5e999ad23610b4e16468470cda4d3561a4698b05 (diff) | |
| download | poky-66668375f5817adac80e96bfb3972db97d0b8482.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: d4efeada4b8011f18a1ba9464c70e1a2ebe33d3b)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 09d303ca295dc27874c72b30c37a64d1fdf4c5c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/apr/apr-util_1.6.1.bb | 5 |
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 \ | |||
| 19 | SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" | 19 | SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f" |
| 20 | SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" | 20 | SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459" |
| 21 | 21 | ||
| 22 | EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ | 22 | EXTRA_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" | |||
| 69 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" | 68 | PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" |
| 70 | PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" | 69 | PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" |
| 71 | PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" | 70 | PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" |
| 72 | PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" | 71 | PACKAGECONFIG[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} |
| 75 | FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" | 74 | FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" |