summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-06-17 12:15:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-17 16:31:52 +0100
commita1a3a3b80ef6be77a323b461ba302769e09e0a49 (patch)
tree9a8dd96d9c10308dbad511b009ec01774ab4a251 /meta/recipes-support
parent2fd754bed7516c4a698b04f0fdd429354d703eda (diff)
downloadpoky-a1a3a3b80ef6be77a323b461ba302769e09e0a49.tar.gz
apr-util: make gdbm optional
This helps with gpl3-free builds. (From OE-Core rev: 3260ad9e8ff185b4799269bbcdd9f638e976c4b4) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/apr/apr-util_1.6.1.bb6
1 files 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 @@
1SUMMARY = "Apache Portable Runtime (APR) companion library" 1SUMMARY = "Apache Portable Runtime (APR) companion library"
2HOMEPAGE = "http://apr.apache.org/" 2HOMEPAGE = "http://apr.apache.org/"
3SECTION = "libs" 3SECTION = "libs"
4DEPENDS = "apr expat gdbm" 4DEPENDS = "apr expat"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7
@@ -23,7 +23,6 @@ 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 \ 25 --with-dbm=gdbm \
26 --with-gdbm=${STAGING_DIR_HOST}${prefix} \
27 --without-sqlite2 \ 26 --without-sqlite2 \
28 --with-expat=${STAGING_DIR_HOST}${prefix}" 27 --with-expat=${STAGING_DIR_HOST}${prefix}"
29 28
@@ -66,10 +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
69PACKAGECONFIG ??= "crypto" 68PACKAGECONFIG ??= "crypto gdbm"
70PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" 69PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
71PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl" 70PACKAGECONFIG[crypto] = "--with-openssl=${STAGING_DIR_HOST}${prefix} --with-crypto,--without-crypto,openssl"
72PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3" 71PACKAGECONFIG[sqlite3] = "--with-sqlite3=${STAGING_DIR_HOST}${prefix},--without-sqlite3,sqlite3"
72PACKAGECONFIG[gdbm] = "--with-gdbm=${STAGING_DIR_HOST}${prefix},--without-gdbm,gdbm"
73 73
74#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} 74#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}" 75FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}"