> -----Original Message-----
> From: [email protected] <openembedded-
> [email protected]> On Behalf Of Alexander Kanavin
> Sent: den 17 juni 2020 12:16
> To: [email protected]
> Cc: Alexander Kanavin <[email protected]>
> Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optional
>
> This helps with gpl3-free builds.
>
> Signed-off-by: Alexander Kanavin <[email protected]>
> ---
> 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"
Since I assume this is not the only place where it is needed to disable a
feature to achieve a GPL-3.0 free build, maybe we should introduce a distro
feature to control them? E.g.:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'allow-gpl3',
'gdbm', '', d)} \
crypto"
This would make it a lot easier for anyone who wants to disable the use of
GPL-3.0 code as they would not have to go searching through the recipes for
these kind of features to disable.
> 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}"
> --
> 2.27.0
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#139712):
https://lists.openembedded.org/g/openembedded-core/message/139712
Mute This Topic: https://lists.openembedded.org/mt/74934568/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
