* [PATCH 1/2] apr-util: make gdbm optional @ 2020-06-17 10:15 Alexander Kanavin 2020-06-17 10:15 ` [PATCH 2/2] gobject-introspection: add a patch to fix a build race Alexander Kanavin 2020-06-20 11:30 ` [OE-core] [PATCH 1/2] apr-util: make gdbm optional Peter Kjellerstedt 0 siblings, 2 replies; 6+ messages in thread From: Alexander Kanavin @ 2020-06-17 10:15 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin This helps with gpl3-free builds. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- 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}" -- 2.27.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] gobject-introspection: add a patch to fix a build race 2020-06-17 10:15 [PATCH 1/2] apr-util: make gdbm optional Alexander Kanavin @ 2020-06-17 10:15 ` Alexander Kanavin 2020-06-20 11:30 ` [OE-core] [PATCH 1/2] apr-util: make gdbm optional Peter Kjellerstedt 1 sibling, 0 replies; 6+ messages in thread From: Alexander Kanavin @ 2020-06-17 10:15 UTC (permalink / raw) To: openembedded-core; +Cc: Alexander Kanavin Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- ...ency-for-g-ir-compiler-for-building-.patch | 33 +++++++++++++++++++ .../gobject-introspection_1.64.1.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch new file mode 100644 index 0000000000..adb357b5ec --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch @@ -0,0 +1,33 @@ +From 56ba5656258b82dbc069ab3a61e597c931a16a83 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 17 Jun 2020 11:43:16 +0200 +Subject: [PATCH] gir: add a dependency for g-ir-compiler for building .girs + +meson inserts the dependency if the compiler is used directly, but +fails to do so if the compiler is run through a wrapper. This leads +to build race errors between building the compiler and using it. + +Fix provided by Quentin Schulz <quentin.schulz@streamunlimited.com> + +Upstream-Status: Accepted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/228] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + gir/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gir/meson.build b/gir/meson.build +index b37fdb81..557e5517 100644 +--- a/gir/meson.build ++++ b/gir/meson.build +@@ -448,7 +448,7 @@ foreach gir : gir_files + typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(), + input: gir, + output: '@BASENAME@.typelib', +- depends: [gobject_gir, ], ++ depends: [gobject_gir, gircompiler, ], + command: gircompiler_command, + install: true, + install_dir: typelibdir, +-- +2.27.0 + diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb index 9dfb55e055..7eefdd3e27 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.64.1.bb @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ + file://0001-gir-add-a-dependency-for-g-ir-compiler-for-building-.patch \ " SRC_URI[md5sum] = "3419dfd086efcf83768e0579ab6abd2b" -- 2.27.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional 2020-06-17 10:15 [PATCH 1/2] apr-util: make gdbm optional Alexander Kanavin 2020-06-17 10:15 ` [PATCH 2/2] gobject-introspection: add a patch to fix a build race Alexander Kanavin @ 2020-06-20 11:30 ` Peter Kjellerstedt 2020-06-20 12:51 ` Alexander Kanavin 1 sibling, 1 reply; 6+ messages in thread From: Peter Kjellerstedt @ 2020-06-20 11:30 UTC (permalink / raw) To: Alexander Kanavin, openembedded-core@lists.openembedded.org > -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded- > core@lists.openembedded.org> On Behalf Of Alexander Kanavin > Sent: den 17 juni 2020 12:16 > To: openembedded-core@lists.openembedded.org > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optional > > This helps with gpl3-free builds. > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > --- > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional 2020-06-20 11:30 ` [OE-core] [PATCH 1/2] apr-util: make gdbm optional Peter Kjellerstedt @ 2020-06-20 12:51 ` Alexander Kanavin 2020-06-20 14:03 ` Peter Kjellerstedt 0 siblings, 1 reply; 6+ messages in thread From: Alexander Kanavin @ 2020-06-20 12:51 UTC (permalink / raw) To: Peter Kjellerstedt; +Cc: openembedded-core@lists.openembedded.org [-- Attachment #1: Type: text/plain, Size: 3457 bytes --] In our environment gpl3 is not banned across the distro but rather banned only in the product image, with a targeted set of recipe tweaks aimed to allow that image to build. Non-product images are still permitted to contain gpl3 items. Since everyone has a different set of what goes into their product image, and what doesn't, and there are inevitably various 3rd party layers in the mix, I do not think a distro setting would make much sense. Alex On Sat, 20 Jun 2020 at 13:30, Peter Kjellerstedt < peter.kjellerstedt@axis.com> wrote: > > -----Original Message----- > > From: openembedded-core@lists.openembedded.org <openembedded- > > core@lists.openembedded.org> On Behalf Of Alexander Kanavin > > Sent: den 17 juni 2020 12:16 > > To: openembedded-core@lists.openembedded.org > > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > > Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optional > > > > This helps with gpl3-free builds. > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > > 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 > > [-- Attachment #2: Type: text/html, Size: 5098 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional 2020-06-20 12:51 ` Alexander Kanavin @ 2020-06-20 14:03 ` Peter Kjellerstedt 2020-06-20 16:11 ` Alexander Kanavin 0 siblings, 1 reply; 6+ messages in thread From: Peter Kjellerstedt @ 2020-06-20 14:03 UTC (permalink / raw) To: Alexander Kanavin; +Cc: openembedded-core@lists.openembedded.org [-- Attachment #1: Type: text/plain, Size: 4447 bytes --] Hmm, ok. How about a common without_gpl3.inc file? It could serve as a place to gather/document these PACKAGECONFIGs and other setting that need to be enabled to build without GPL-3.0. That way you are not forced in the same way as a distro feature would be, but at the same time it is easy for anyone who wants to disable GPL-3.0 for their build to find all the setting they need to tweak. //Peter From: Alexander Kanavin <alex.kanavin@gmail.com> Sent: den 20 juni 2020 14:52 To: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional In our environment gpl3 is not banned across the distro but rather banned only in the product image, with a targeted set of recipe tweaks aimed to allow that image to build. Non-product images are still permitted to contain gpl3 items. Since everyone has a different set of what goes into their product image, and what doesn't, and there are inevitably various 3rd party layers in the mix, I do not think a distro setting would make much sense. Alex On Sat, 20 Jun 2020 at 13:30, Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> wrote: > -----Original Message----- > From: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> <openembedded- > core@lists.openembedded.org<mailto:core@lists.openembedded.org>> On Behalf Of Alexander Kanavin > Sent: den 17 juni 2020 12:16 > To: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> > Cc: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>> > Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optional > > This helps with gpl3-free builds. > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com<mailto:alex.kanavin@gmail.com>> > --- > meta/recipes-support/apr/apr-util_1.6.1.bb<http://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<http://apr-util_1.6.1.bb> b/meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> > index 3896c924f0..0dd8f025e8 100644 > --- a/meta/recipes-support/apr/apr-util_1.6.1.bb<http://apr-util_1.6.1.bb> > +++ b/meta/recipes-support/apr/apr-util_1.6.1.bb<http://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<mailto:$%7b@bb.utils.contains('DISTRO_FEATURES',%20'allow-gpl3',%20'gdbm',%20'',%20d)%7d%20\%0b %20 %20 %20 %20 %20 %20 %20 %20 %20 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 [-- Attachment #2: Type: text/html, Size: 9151 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional 2020-06-20 14:03 ` Peter Kjellerstedt @ 2020-06-20 16:11 ` Alexander Kanavin 0 siblings, 0 replies; 6+ messages in thread From: Alexander Kanavin @ 2020-06-20 16:11 UTC (permalink / raw) To: Peter Kjellerstedt; +Cc: openembedded-core@lists.openembedded.org [-- Attachment #1: Type: text/plain, Size: 5187 bytes --] This would still need to be tested with a specific image(s) from oe-core, otherwise it is prone to bit rot. And it would not include tweaks from meta-oe (e.g. lua) or anywhere else. We already test no-gpl3-ness for core-image-minimal and core-image-full-cmdline (to match the meta-gpl2 tests), and neither needs PACKAGECONFIG tweaks: http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/lib/oeqa/selftest/cases/incompatible_lic.py#n118 The same test could be extended for maybe core-image-sato and core-image-weston. Whether those images will produce a nice list of tweaks, or are good as they are, I can't tell. apr-util for example is not included into any of them. Alex On Sat, 20 Jun 2020 at 16:03, Peter Kjellerstedt < peter.kjellerstedt@axis.com> wrote: > Hmm, ok. How about a common without_gpl3.inc file? It could serve as a > place to gather/document these PACKAGECONFIGs and other setting that need > to be enabled to build without GPL-3.0. That way you are not forced in the > same way as a distro feature would be, but at the same time it is easy for > anyone who wants to disable GPL-3.0 for their build to find all the setting > they need to tweak. > > > > //Peter > > > > *From:* Alexander Kanavin <alex.kanavin@gmail.com> > *Sent:* den 20 juni 2020 14:52 > *To:* Peter Kjellerstedt <peter.kjellerstedt@axis.com> > *Cc:* openembedded-core@lists.openembedded.org > *Subject:* Re: [OE-core] [PATCH 1/2] apr-util: make gdbm optional > > > > In our environment gpl3 is not banned across the distro but rather banned > only in the product image, with a targeted set of recipe tweaks aimed to > allow that image to build. Non-product images are still permitted to > contain gpl3 items. Since everyone has a different set of what goes into > their product image, and what doesn't, and there are inevitably various 3rd > party layers in the mix, I do not think a distro setting would make much > sense. > > > > Alex > > > > On Sat, 20 Jun 2020 at 13:30, Peter Kjellerstedt < > peter.kjellerstedt@axis.com> wrote: > > > -----Original Message----- > > From: openembedded-core@lists.openembedded.org <openembedded- > > core@lists.openembedded.org> On Behalf Of Alexander Kanavin > > Sent: den 17 juni 2020 12:16 > > To: openembedded-core@lists.openembedded.org > > Cc: Alexander Kanavin <alex.kanavin@gmail.com> > > Subject: [OE-core] [PATCH 1/2] apr-util: make gdbm optional > > > > This helps with gpl3-free builds. > > > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> > > --- > > 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 > <$%7b@bb.utils.contains('DISTRO_FEATURES',%20'allow-gpl3',%20'gdbm',%20'',%20d)%7d%20%5C%0b%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0%20%C2%A0crypto> > " > > 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 > > [-- Attachment #2: Type: text/html, Size: 8790 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-20 16:11 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-06-17 10:15 [PATCH 1/2] apr-util: make gdbm optional Alexander Kanavin 2020-06-17 10:15 ` [PATCH 2/2] gobject-introspection: add a patch to fix a build race Alexander Kanavin 2020-06-20 11:30 ` [OE-core] [PATCH 1/2] apr-util: make gdbm optional Peter Kjellerstedt 2020-06-20 12:51 ` Alexander Kanavin 2020-06-20 14:03 ` Peter Kjellerstedt 2020-06-20 16:11 ` Alexander Kanavin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox