| Message ID | 20200310124459.908611-3-john@metanate.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pkg-meson/libglib2: restore use of system printf | expand |
Hello John, On Tue, 10 Mar 2020 12:44:59 +0000, John Keeping <john@metanate.com> wrote: > Prior to commit 4102db0f7a ("package/libglib2: bump to version 2.60.3") > which converted libglib2 to meson, Buildroot used to set a range of > autoconf options to bypass tests that require running binaries. > > The meson version of libglib2's build system has many fewer of these > checks, but there are still some and these can be fed the "correct" > answer by adding properties to cross-compilation.conf. > > Add the necessary properties to indicate that we have C99 compliant > print functions to avoid pulling in the gnulib fallback. > > Signed-off-by: John Keeping <john@metanate.com> > --- > package/libglib2/libglib2.mk | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index f00818f69c..a206639f74 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \ > -Dinstalled_tests=false \ > -Doss_fuzz=disabled > > +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ > + have_c99_vsnprintf=true \ > + have_c99_snprintf=true \ > + have_unix98_printf=true > + Not sure if the buildroot 'all configuration options should be set even if the default fits' applies for the cross properties here too, but there are some more: $ grep meson.get_cross_property build/libglib2-2.62.4/meson.build have_good_vsnprintf = meson.get_cross_property('have_c99_vsnprintf', false) have_good_snprintf = meson.get_cross_property('have_c99_snprintf', false) have_good_printf = meson.get_cross_property('have_unix98_printf', false) glib_va_val_copy = meson.get_cross_property('va_val_copy', true) growing_stack = meson.get_cross_property('growing_stack', false) elif meson.get_cross_property('have_strlcpy', false) have_proc_self_cmdline = meson.get_cross_property('have_proc_self_cmdline', false) Besides of this as the patch is surely a fix/improvement... Reviewed-by: Peter Seiderer <ps.report@gmx.net> Regards, Peter > ifneq ($(BR2_ENABLE_LOCALE),y) > LIBGLIB2_DEPENDENCIES += libiconv > endif
Hi Peter, On Tue, 10 Mar 2020 15:13:47 +0100 Peter Seiderer <ps.report@gmx.net> wrote: > On Tue, 10 Mar 2020 12:44:59 +0000, John Keeping <john@metanate.com> wrote: > > > Prior to commit 4102db0f7a ("package/libglib2: bump to version 2.60.3") > > which converted libglib2 to meson, Buildroot used to set a range of > > autoconf options to bypass tests that require running binaries. > > > > The meson version of libglib2's build system has many fewer of these > > checks, but there are still some and these can be fed the "correct" > > answer by adding properties to cross-compilation.conf. > > > > Add the necessary properties to indicate that we have C99 compliant > > print functions to avoid pulling in the gnulib fallback. > > > > Signed-off-by: John Keeping <john@metanate.com> > > --- > > package/libglib2/libglib2.mk | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > > index f00818f69c..a206639f74 100644 > > --- a/package/libglib2/libglib2.mk > > +++ b/package/libglib2/libglib2.mk > > @@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \ > > -Dinstalled_tests=false \ > > -Doss_fuzz=disabled > > > > +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ > > + have_c99_vsnprintf=true \ > > + have_c99_snprintf=true \ > > + have_unix98_printf=true > > + > > Not sure if the buildroot 'all configuration options should be set even if the > default fits' applies for the cross properties here too, but there are some > more: > > $ grep meson.get_cross_property build/libglib2-2.62.4/meson.build > have_good_vsnprintf = meson.get_cross_property('have_c99_vsnprintf', false) > have_good_snprintf = meson.get_cross_property('have_c99_snprintf', false) > have_good_printf = meson.get_cross_property('have_unix98_printf', false) > glib_va_val_copy = meson.get_cross_property('va_val_copy', true) > growing_stack = meson.get_cross_property('growing_stack', false) > elif meson.get_cross_property('have_strlcpy', false) > have_proc_self_cmdline = meson.get_cross_property('have_proc_self_cmdline', false) > > Besides of this as the patch is surely a fix/improvement... My understanding is that the policy is to avoid automatic configuration where the order in which packages are built will affect the result. For all of these the value is fixed to "false" when cross-compiling, so I don't think we need to specify that. Regards, John > Reviewed-by: Peter Seiderer <ps.report@gmx.net> > > Regards, > Peter > > > ifneq ($(BR2_ENABLE_LOCALE),y) > > LIBGLIB2_DEPENDENCIES += libiconv > > endif >
All; reviewed-by: Adam Duskett <aduskett@gmail.com> On Tue, Mar 10, 2020 at 7:13 AM Peter Seiderer <ps.report@gmx.net> wrote: > > Hello John, > > On Tue, 10 Mar 2020 12:44:59 +0000, John Keeping <john@metanate.com> wrote: > > > Prior to commit 4102db0f7a ("package/libglib2: bump to version 2.60.3") > > which converted libglib2 to meson, Buildroot used to set a range of > > autoconf options to bypass tests that require running binaries. > > > > The meson version of libglib2's build system has many fewer of these > > checks, but there are still some and these can be fed the "correct" > > answer by adding properties to cross-compilation.conf. > > > > Add the necessary properties to indicate that we have C99 compliant > > print functions to avoid pulling in the gnulib fallback. > > > > Signed-off-by: John Keeping <john@metanate.com> > > --- > > package/libglib2/libglib2.mk | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > > index f00818f69c..a206639f74 100644 > > --- a/package/libglib2/libglib2.mk > > +++ b/package/libglib2/libglib2.mk > > @@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \ > > -Dinstalled_tests=false \ > > -Doss_fuzz=disabled > > > > +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ > > + have_c99_vsnprintf=true \ > > + have_c99_snprintf=true \ > > + have_unix98_printf=true > > + > > Not sure if the buildroot 'all configuration options should be set even if the > default fits' applies for the cross properties here too, but there are some > more: > > $ grep meson.get_cross_property build/libglib2-2.62.4/meson.build > have_good_vsnprintf = meson.get_cross_property('have_c99_vsnprintf', false) > have_good_snprintf = meson.get_cross_property('have_c99_snprintf', false) > have_good_printf = meson.get_cross_property('have_unix98_printf', false) > glib_va_val_copy = meson.get_cross_property('va_val_copy', true) > growing_stack = meson.get_cross_property('growing_stack', false) > elif meson.get_cross_property('have_strlcpy', false) > have_proc_self_cmdline = meson.get_cross_property('have_proc_self_cmdline', false) > > Besides of this as the patch is surely a fix/improvement... > > Reviewed-by: Peter Seiderer <ps.report@gmx.net> > > Regards, > Peter > > > ifneq ($(BR2_ENABLE_LOCALE),y) > > LIBGLIB2_DEPENDENCIES += libiconv > > endif >
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index f00818f69c..a206639f74 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -52,6 +52,11 @@ LIBGLIB2_CONF_OPTS = \ -Dinstalled_tests=false \ -Doss_fuzz=disabled +LIBGLIB2_MESON_EXTRA_PROPERTIES = \ + have_c99_vsnprintf=true \ + have_c99_snprintf=true \ + have_unix98_printf=true + ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv endif
Prior to commit 4102db0f7a ("package/libglib2: bump to version 2.60.3") which converted libglib2 to meson, Buildroot used to set a range of autoconf options to bypass tests that require running binaries. The meson version of libglib2's build system has many fewer of these checks, but there are still some and these can be fed the "correct" answer by adding properties to cross-compilation.conf. Add the necessary properties to indicate that we have C99 compliant print functions to avoid pulling in the gnulib fallback. Signed-off-by: John Keeping <john@metanate.com> --- package/libglib2/libglib2.mk | 5 +++++ 1 file changed, 5 insertions(+)