From 3260ad9e8ff185b4799269bbcdd9f638e976c4b4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 17 Jun 2020 12:15:51 +0200 Subject: apr-util: make gdbm optional This helps with gpl3-free builds. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/apr/apr-util_1.6.1.bb | 6 +++--- 1 file changed, 3 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 3896c924f0..0dd8f025e8 100644 --- a/meta/recipes-support/apr/apr-util_1.6.1.bb +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Apache Portable Runtime (APR) companion library" HOMEPAGE = "http://apr.apache.org/" SECTION = "libs" -DEPENDS = "apr expat gdbm" +DEPENDS = "apr expat" BBCLASSEXTEND = "native nativesdk" @@ -23,7 +23,6 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ --without-pgsql \ --with-dbm=gdbm \ - --with-gdbm=${STAGING_DIR_HOST}${prefix} \ --without-sqlite2 \ --with-expat=${STAGING_DIR_HOST}${prefix}" @@ -66,10 +65,11 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -PACKAGECONFIG ??= "crypto" +PACKAGECONFIG ??= "crypto gdbm" PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" +PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm" #files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" -- cgit 1.2.3-korg