* [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 @ 2022-07-15 5:38 James Hilliard 2022-07-17 7:47 ` Yann E. MORIN 2022-07-17 8:32 ` Yann E. MORIN 0 siblings, 2 replies; 5+ messages in thread From: James Hilliard @ 2022-07-15 5:38 UTC (permalink / raw) To: buildroot; +Cc: James Hilliard, Fabrice Fontaine Rebase remove cpp requirement patch. Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- .../0002-remove-cpp-requirement.patch | 49 ++++++++----------- package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 4 +- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch index b5603c92f4..84511dea32 100644 --- a/package/libglib2/0002-remove-cpp-requirement.patch +++ b/package/libglib2/0002-remove-cpp-requirement.patch @@ -1,4 +1,4 @@ -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 From: Adam Duskett <Aduskett@gmail.com> Date: Mon, 16 Sep 2019 10:12:38 -0700 Subject: [PATCH] remove cpp requirement @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) https://gitlab.gnome.org/GNOME/glib/issues/1748 --- glib/glibconfig.h.in | 1 - - meson.build | 18 +----------------- - tests/meson.build | 5 ----- - 3 files changed, 1 insertion(+), 23 deletions(-) + meson.build | 19 +------------------ + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in -index 7ef8c48..128e65d 100644 +index e66748d95..2173d8be6 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; @glib_vacopy@ @g_have_iso_c_varargs@ @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi * is passed ISO vararg support is turned off, and there is no work diff --git a/meson.build b/meson.build -index 4bbf4c2..ac59f4e 100644 +index 48fdfe864..5df242e39 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.70.4', - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships - meson_version : '>= 0.49.2', + version : '2.72.3', + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships + meson_version : '>= 0.52.0', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', ) @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs +@@ -495,7 +494,6 @@ else + endif + + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') + + # FIXME: We cannot build some of the GResource tests with -z nodelete, which + # means we cannot use that flag in add_project_link_arguments(), and must add +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs #endif''') endif @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2339,7 +2324,6 @@ subdir('gobject') +@@ -2381,7 +2365,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 if build_tests subdir('tests') endif -diff --git a/tests/meson.build b/tests/meson.build -index e4ea226..7fd974c 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -55,11 +55,6 @@ tests = { - 'source': 'module-test.c', - 'c_args': ['-DMODULE_TYPE="plugin"'], - }, -- 'cxx-test' : { -- 'source' : 'cxx-test.cpp', -- 'include_directories' : gmoduleinc, -- 'dependencies' : [libgio_dep], -- }, - } - - test_extra_programs = { -- -2.23.0 +2.34.1 diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index f0f0cb55ad..0395ff234a 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum -sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index 18f5b329c7..2970d5a7a9 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.70 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.72 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 2022-07-15 5:38 [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 James Hilliard @ 2022-07-17 7:47 ` Yann E. MORIN 2022-07-17 8:15 ` James Hilliard 2022-07-17 8:32 ` Yann E. MORIN 1 sibling, 1 reply; 5+ messages in thread From: Yann E. MORIN @ 2022-07-17 7:47 UTC (permalink / raw) To: James Hilliard; +Cc: Fabrice Fontaine, buildroot James, All, On 2022-07-14 23:38 -0600, James Hilliard spake thusly: > Rebase remove cpp requirement patch. Why did you not just replace it with an actual backport of the upstream commit d0b9ebbaacb5 (meson: fix build without cpp toolchain), which you authored? And: cool that you managed to get that upstreamed! :-) Regards, Yann E. MORIN. > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > --- > .../0002-remove-cpp-requirement.patch | 49 ++++++++----------- > package/libglib2/libglib2.hash | 4 +- > package/libglib2/libglib2.mk | 4 +- > 3 files changed, 24 insertions(+), 33 deletions(-) > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > index b5603c92f4..84511dea32 100644 > --- a/package/libglib2/0002-remove-cpp-requirement.patch > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > @@ -1,4 +1,4 @@ > -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 > +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 > From: Adam Duskett <Aduskett@gmail.com> > Date: Mon, 16 Sep 2019 10:12:38 -0700 > Subject: [PATCH] remove cpp requirement > @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) > https://gitlab.gnome.org/GNOME/glib/issues/1748 > --- > glib/glibconfig.h.in | 1 - > - meson.build | 18 +----------------- > - tests/meson.build | 5 ----- > - 3 files changed, 1 insertion(+), 23 deletions(-) > + meson.build | 19 +------------------ > + 2 files changed, 1 insertion(+), 19 deletions(-) > > diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in > -index 7ef8c48..128e65d 100644 > +index e66748d95..2173d8be6 100644 > --- a/glib/glibconfig.h.in > +++ b/glib/glibconfig.h.in > -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > @glib_vacopy@ > > @g_have_iso_c_varargs@ > @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 > /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi > * is passed ISO vararg support is turned off, and there is no work > diff --git a/meson.build b/meson.build > -index 4bbf4c2..ac59f4e 100644 > +index 48fdfe864..5df242e39 100644 > --- a/meson.build > +++ b/meson.build > @@ -1,4 +1,4 @@ > -project('glib', 'c', 'cpp', > +project('glib', 'c', > - version : '2.70.4', > - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > - meson_version : '>= 0.49.2', > + version : '2.72.3', > + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships > + meson_version : '>= 0.52.0', > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > ) > > @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > -@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > +@@ -495,7 +494,6 @@ else > + endif > + > + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') > +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') > + > + # FIXME: We cannot build some of the GResource tests with -z nodelete, which > + # means we cannot use that flag in add_project_link_arguments(), and must add > +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs > #endif''') > endif > > @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 > g_have_gnuc_varargs = cc.compiles(''' > void some_func (void) { > int a(int p1, int p2, int p3); > -@@ -2339,7 +2324,6 @@ subdir('gobject') > +@@ -2381,7 +2365,6 @@ subdir('gobject') > subdir('gthread') > subdir('gmodule') > subdir('gio') > @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 > if build_tests > subdir('tests') > endif > -diff --git a/tests/meson.build b/tests/meson.build > -index e4ea226..7fd974c 100644 > ---- a/tests/meson.build > -+++ b/tests/meson.build > -@@ -55,11 +55,6 @@ tests = { > - 'source': 'module-test.c', > - 'c_args': ['-DMODULE_TYPE="plugin"'], > - }, > -- 'cxx-test' : { > -- 'source' : 'cxx-test.cpp', > -- 'include_directories' : gmoduleinc, > -- 'dependencies' : [libgio_dep], > -- }, > - } > - > - test_extra_programs = { > -- > -2.23.0 > +2.34.1 > > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > index f0f0cb55ad..0395ff234a 100644 > --- a/package/libglib2/libglib2.hash > +++ b/package/libglib2/libglib2.hash > @@ -1,4 +1,4 @@ > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > -sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum > +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz > # License files, locally calculated > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index 18f5b329c7..2970d5a7a9 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBGLIB2_VERSION_MAJOR = 2.70 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > +LIBGLIB2_VERSION_MAJOR = 2.72 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > LIBGLIB2_LICENSE = LGPL-2.1+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 2022-07-17 7:47 ` Yann E. MORIN @ 2022-07-17 8:15 ` James Hilliard 2022-07-17 8:33 ` Yann E. MORIN 0 siblings, 1 reply; 5+ messages in thread From: James Hilliard @ 2022-07-17 8:15 UTC (permalink / raw) To: Yann E. MORIN; +Cc: Fabrice Fontaine, buildroot On Sun, Jul 17, 2022 at 1:47 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > James, All, > > On 2022-07-14 23:38 -0600, James Hilliard spake thusly: > > Rebase remove cpp requirement patch. > > Why did you not just replace it with an actual backport of the upstream > commit d0b9ebbaacb5 (meson: fix build without cpp toolchain), which you > authored? I wrote that after I already forward-ported the buildroot patch, my upstream patch doesn't seem to apply cleanly on top of 2.72.3 so I just stuck with this one for 2.72.3. > > And: cool that you managed to get that upstreamed! :-) Figured if I wrote a patch which only disabled cpp when no cpp toolchain existed rather than just create an issue in their bug tracker it would likely be accepted. > > Regards, > Yann E. MORIN. > > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > --- > > .../0002-remove-cpp-requirement.patch | 49 ++++++++----------- > > package/libglib2/libglib2.hash | 4 +- > > package/libglib2/libglib2.mk | 4 +- > > 3 files changed, 24 insertions(+), 33 deletions(-) > > > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > > index b5603c92f4..84511dea32 100644 > > --- a/package/libglib2/0002-remove-cpp-requirement.patch > > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > > @@ -1,4 +1,4 @@ > > -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 > > +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 > > From: Adam Duskett <Aduskett@gmail.com> > > Date: Mon, 16 Sep 2019 10:12:38 -0700 > > Subject: [PATCH] remove cpp requirement > > @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) > > https://gitlab.gnome.org/GNOME/glib/issues/1748 > > --- > > glib/glibconfig.h.in | 1 - > > - meson.build | 18 +----------------- > > - tests/meson.build | 5 ----- > > - 3 files changed, 1 insertion(+), 23 deletions(-) > > + meson.build | 19 +------------------ > > + 2 files changed, 1 insertion(+), 19 deletions(-) > > > > diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in > > -index 7ef8c48..128e65d 100644 > > +index e66748d95..2173d8be6 100644 > > --- a/glib/glibconfig.h.in > > +++ b/glib/glibconfig.h.in > > -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > > +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > > @glib_vacopy@ > > > > @g_have_iso_c_varargs@ > > @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 > > /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi > > * is passed ISO vararg support is turned off, and there is no work > > diff --git a/meson.build b/meson.build > > -index 4bbf4c2..ac59f4e 100644 > > +index 48fdfe864..5df242e39 100644 > > --- a/meson.build > > +++ b/meson.build > > @@ -1,4 +1,4 @@ > > -project('glib', 'c', 'cpp', > > +project('glib', 'c', > > - version : '2.70.4', > > - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > > - meson_version : '>= 0.49.2', > > + version : '2.72.3', > > + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships > > + meson_version : '>= 0.52.0', > > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > > ) > > > > @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 > > > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > > > -@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > > +@@ -495,7 +494,6 @@ else > > + endif > > + > > + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') > > +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') > > + > > + # FIXME: We cannot build some of the GResource tests with -z nodelete, which > > + # means we cannot use that flag in add_project_link_arguments(), and must add > > +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs > > #endif''') > > endif > > > > @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 > > g_have_gnuc_varargs = cc.compiles(''' > > void some_func (void) { > > int a(int p1, int p2, int p3); > > -@@ -2339,7 +2324,6 @@ subdir('gobject') > > +@@ -2381,7 +2365,6 @@ subdir('gobject') > > subdir('gthread') > > subdir('gmodule') > > subdir('gio') > > @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 > > if build_tests > > subdir('tests') > > endif > > -diff --git a/tests/meson.build b/tests/meson.build > > -index e4ea226..7fd974c 100644 > > ---- a/tests/meson.build > > -+++ b/tests/meson.build > > -@@ -55,11 +55,6 @@ tests = { > > - 'source': 'module-test.c', > > - 'c_args': ['-DMODULE_TYPE="plugin"'], > > - }, > > -- 'cxx-test' : { > > -- 'source' : 'cxx-test.cpp', > > -- 'include_directories' : gmoduleinc, > > -- 'dependencies' : [libgio_dep], > > -- }, > > - } > > - > > - test_extra_programs = { > > -- > > -2.23.0 > > +2.34.1 > > > > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > > index f0f0cb55ad..0395ff234a 100644 > > --- a/package/libglib2/libglib2.hash > > +++ b/package/libglib2/libglib2.hash > > @@ -1,4 +1,4 @@ > > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > > -sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > > +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum > > +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz > > # License files, locally calculated > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > > index 18f5b329c7..2970d5a7a9 100644 > > --- a/package/libglib2/libglib2.mk > > +++ b/package/libglib2/libglib2.mk > > @@ -4,8 +4,8 @@ > > # > > ################################################################################ > > > > -LIBGLIB2_VERSION_MAJOR = 2.70 > > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > > +LIBGLIB2_VERSION_MAJOR = 2.72 > > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 > > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > > LIBGLIB2_LICENSE = LGPL-2.1+ > > -- > > 2.34.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 2022-07-17 8:15 ` James Hilliard @ 2022-07-17 8:33 ` Yann E. MORIN 0 siblings, 0 replies; 5+ messages in thread From: Yann E. MORIN @ 2022-07-17 8:33 UTC (permalink / raw) To: James Hilliard; +Cc: Fabrice Fontaine, buildroot James, All, On 2022-07-17 02:15 -0600, James Hilliard spake thusly: > On Sun, Jul 17, 2022 at 1:47 AM Yann E. MORIN <yann.morin.1998@free.fr> wrote: > > > > James, All, > > > > On 2022-07-14 23:38 -0600, James Hilliard spake thusly: > > > Rebase remove cpp requirement patch. > > > > Why did you not just replace it with an actual backport of the upstream > > commit d0b9ebbaacb5 (meson: fix build without cpp toolchain), which you > > authored? > > I wrote that after I already forward-ported the buildroot patch, my upstream > patch doesn't seem to apply cleanly on top of 2.72.3 so I just stuck with this > one for 2.72.3. OK, thabnks for the feedback. Regards, Yann E. MORIN. > > > > And: cool that you managed to get that upstreamed! :-) > > Figured if I wrote a patch which only disabled cpp when no cpp toolchain existed > rather than just create an issue in their bug tracker it would likely > be accepted. > > > > > Regards, > > Yann E. MORIN. > > > > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > > --- > > > .../0002-remove-cpp-requirement.patch | 49 ++++++++----------- > > > package/libglib2/libglib2.hash | 4 +- > > > package/libglib2/libglib2.mk | 4 +- > > > 3 files changed, 24 insertions(+), 33 deletions(-) > > > > > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > > > index b5603c92f4..84511dea32 100644 > > > --- a/package/libglib2/0002-remove-cpp-requirement.patch > > > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > > > @@ -1,4 +1,4 @@ > > > -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 > > > +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 > > > From: Adam Duskett <Aduskett@gmail.com> > > > Date: Mon, 16 Sep 2019 10:12:38 -0700 > > > Subject: [PATCH] remove cpp requirement > > > @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) > > > https://gitlab.gnome.org/GNOME/glib/issues/1748 > > > --- > > > glib/glibconfig.h.in | 1 - > > > - meson.build | 18 +----------------- > > > - tests/meson.build | 5 ----- > > > - 3 files changed, 1 insertion(+), 23 deletions(-) > > > + meson.build | 19 +------------------ > > > + 2 files changed, 1 insertion(+), 19 deletions(-) > > > > > > diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in > > > -index 7ef8c48..128e65d 100644 > > > +index e66748d95..2173d8be6 100644 > > > --- a/glib/glibconfig.h.in > > > +++ b/glib/glibconfig.h.in > > > -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > > > +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > > > @glib_vacopy@ > > > > > > @g_have_iso_c_varargs@ > > > @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 > > > /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi > > > * is passed ISO vararg support is turned off, and there is no work > > > diff --git a/meson.build b/meson.build > > > -index 4bbf4c2..ac59f4e 100644 > > > +index 48fdfe864..5df242e39 100644 > > > --- a/meson.build > > > +++ b/meson.build > > > @@ -1,4 +1,4 @@ > > > -project('glib', 'c', 'cpp', > > > +project('glib', 'c', > > > - version : '2.70.4', > > > - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > > > - meson_version : '>= 0.49.2', > > > + version : '2.72.3', > > > + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships > > > + meson_version : '>= 0.52.0', > > > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > > > ) > > > > > > @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 > > > > > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > > > > > -@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > > > +@@ -495,7 +494,6 @@ else > > > + endif > > > + > > > + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') > > > +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') > > > + > > > + # FIXME: We cannot build some of the GResource tests with -z nodelete, which > > > + # means we cannot use that flag in add_project_link_arguments(), and must add > > > +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs > > > #endif''') > > > endif > > > > > > @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 > > > g_have_gnuc_varargs = cc.compiles(''' > > > void some_func (void) { > > > int a(int p1, int p2, int p3); > > > -@@ -2339,7 +2324,6 @@ subdir('gobject') > > > +@@ -2381,7 +2365,6 @@ subdir('gobject') > > > subdir('gthread') > > > subdir('gmodule') > > > subdir('gio') > > > @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 > > > if build_tests > > > subdir('tests') > > > endif > > > -diff --git a/tests/meson.build b/tests/meson.build > > > -index e4ea226..7fd974c 100644 > > > ---- a/tests/meson.build > > > -+++ b/tests/meson.build > > > -@@ -55,11 +55,6 @@ tests = { > > > - 'source': 'module-test.c', > > > - 'c_args': ['-DMODULE_TYPE="plugin"'], > > > - }, > > > -- 'cxx-test' : { > > > -- 'source' : 'cxx-test.cpp', > > > -- 'include_directories' : gmoduleinc, > > > -- 'dependencies' : [libgio_dep], > > > -- }, > > > - } > > > - > > > - test_extra_programs = { > > > -- > > > -2.23.0 > > > +2.34.1 > > > > > > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > > > index f0f0cb55ad..0395ff234a 100644 > > > --- a/package/libglib2/libglib2.hash > > > +++ b/package/libglib2/libglib2.hash > > > @@ -1,4 +1,4 @@ > > > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > > > -sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > > > +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum > > > +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz > > > # License files, locally calculated > > > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > > > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > > > index 18f5b329c7..2970d5a7a9 100644 > > > --- a/package/libglib2/libglib2.mk > > > +++ b/package/libglib2/libglib2.mk > > > @@ -4,8 +4,8 @@ > > > # > > > ################################################################################ > > > > > > -LIBGLIB2_VERSION_MAJOR = 2.70 > > > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > > > +LIBGLIB2_VERSION_MAJOR = 2.72 > > > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 > > > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > > > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > > > LIBGLIB2_LICENSE = LGPL-2.1+ > > > -- > > > 2.34.1 > > > > > > _______________________________________________ > > > buildroot mailing list > > > buildroot@buildroot.org > > > https://lists.buildroot.org/mailman/listinfo/buildroot > > > > -- > > .-----------------.--------------------.------------------.--------------------. > > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 2022-07-15 5:38 [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 James Hilliard 2022-07-17 7:47 ` Yann E. MORIN @ 2022-07-17 8:32 ` Yann E. MORIN 1 sibling, 0 replies; 5+ messages in thread From: Yann E. MORIN @ 2022-07-17 8:32 UTC (permalink / raw) To: James Hilliard; +Cc: Fabrice Fontaine, buildroot James, All, On 2022-07-14 23:38 -0600, James Hilliard spake thusly: > Rebase remove cpp requirement patch. > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > .../0002-remove-cpp-requirement.patch | 49 ++++++++----------- > package/libglib2/libglib2.hash | 4 +- > package/libglib2/libglib2.mk | 4 +- > 3 files changed, 24 insertions(+), 33 deletions(-) > > diff --git a/package/libglib2/0002-remove-cpp-requirement.patch b/package/libglib2/0002-remove-cpp-requirement.patch > index b5603c92f4..84511dea32 100644 > --- a/package/libglib2/0002-remove-cpp-requirement.patch > +++ b/package/libglib2/0002-remove-cpp-requirement.patch > @@ -1,4 +1,4 @@ > -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 > +From dd65a8cfdeafeb18b72d8d1eb676c7ca43ae505f Mon Sep 17 00:00:00 2001 > From: Adam Duskett <Aduskett@gmail.com> > Date: Mon, 16 Sep 2019 10:12:38 -0700 > Subject: [PATCH] remove cpp requirement > @@ -12,15 +12,14 @@ Upstream status: Denied (Buildroot specific) > https://gitlab.gnome.org/GNOME/glib/issues/1748 > --- > glib/glibconfig.h.in | 1 - > - meson.build | 18 +----------------- > - tests/meson.build | 5 ----- > - 3 files changed, 1 insertion(+), 23 deletions(-) > + meson.build | 19 +------------------ > + 2 files changed, 1 insertion(+), 19 deletions(-) > > diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in > -index 7ef8c48..128e65d 100644 > +index e66748d95..2173d8be6 100644 > --- a/glib/glibconfig.h.in > +++ b/glib/glibconfig.h.in > -@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > +@@ -119,7 +119,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; > @glib_vacopy@ > > @g_have_iso_c_varargs@ > @@ -29,15 +28,15 @@ index 7ef8c48..128e65d 100644 > /* gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi > * is passed ISO vararg support is turned off, and there is no work > diff --git a/meson.build b/meson.build > -index 4bbf4c2..ac59f4e 100644 > +index 48fdfe864..5df242e39 100644 > --- a/meson.build > +++ b/meson.build > @@ -1,4 +1,4 @@ > -project('glib', 'c', 'cpp', > +project('glib', 'c', > - version : '2.70.4', > - # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships > - meson_version : '>= 0.49.2', > + version : '2.72.3', > + # NOTE: We keep this pinned at 0.52 because that's what Debian Stable ships > + meson_version : '>= 0.52.0', > @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp', > ) > > @@ -46,7 +45,15 @@ index 4bbf4c2..ac59f4e 100644 > > cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() > > -@@ -1696,20 +1695,6 @@ if g_have_iso_c_varargs > +@@ -495,7 +494,6 @@ else > + endif > + > + add_project_arguments(cc.get_supported_arguments(warning_c_args), language: 'c') > +-add_project_arguments(cxx.get_supported_arguments(warning_cxx_args), language: 'cpp') > + > + # FIXME: We cannot build some of the GResource tests with -z nodelete, which > + # means we cannot use that flag in add_project_link_arguments(), and must add > +@@ -1734,20 +1732,6 @@ if g_have_iso_c_varargs > #endif''') > endif > > @@ -67,7 +74,7 @@ index 4bbf4c2..ac59f4e 100644 > g_have_gnuc_varargs = cc.compiles(''' > void some_func (void) { > int a(int p1, int p2, int p3); > -@@ -2339,7 +2324,6 @@ subdir('gobject') > +@@ -2381,7 +2365,6 @@ subdir('gobject') > subdir('gthread') > subdir('gmodule') > subdir('gio') > @@ -75,22 +82,6 @@ index 4bbf4c2..ac59f4e 100644 > if build_tests > subdir('tests') > endif > -diff --git a/tests/meson.build b/tests/meson.build > -index e4ea226..7fd974c 100644 > ---- a/tests/meson.build > -+++ b/tests/meson.build > -@@ -55,11 +55,6 @@ tests = { > - 'source': 'module-test.c', > - 'c_args': ['-DMODULE_TYPE="plugin"'], > - }, > -- 'cxx-test' : { > -- 'source' : 'cxx-test.cpp', > -- 'include_directories' : gmoduleinc, > -- 'dependencies' : [libgio_dep], > -- }, > - } > - > - test_extra_programs = { > -- > -2.23.0 > +2.34.1 > > diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash > index f0f0cb55ad..0395ff234a 100644 > --- a/package/libglib2/libglib2.hash > +++ b/package/libglib2/libglib2.hash > @@ -1,4 +1,4 @@ > -# https://download.gnome.org/sources/glib/2.70/glib-2.70.4.sha256sum > -sha256 ab3d176f3115dcc4e5d02db795984e04e4f4b48d836252e23e8c468e9d423c33 glib-2.70.4.tar.xz > +# https://download.gnome.org/sources/glib/2.72/glib-2.72.3.sha256sum > +sha256 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0 glib-2.72.3.tar.xz > # License files, locally calculated > sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING > diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk > index 18f5b329c7..2970d5a7a9 100644 > --- a/package/libglib2/libglib2.mk > +++ b/package/libglib2/libglib2.mk > @@ -4,8 +4,8 @@ > # > ################################################################################ > > -LIBGLIB2_VERSION_MAJOR = 2.70 > -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 > +LIBGLIB2_VERSION_MAJOR = 2.72 > +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 > LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz > LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) > LIBGLIB2_LICENSE = LGPL-2.1+ > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-17 8:33 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-07-15 5:38 [Buildroot] [PATCH 1/1] package/libglib2: bump to version 2.72.3 James Hilliard 2022-07-17 7:47 ` Yann E. MORIN 2022-07-17 8:15 ` James Hilliard 2022-07-17 8:33 ` Yann E. MORIN 2022-07-17 8:32 ` Yann E. MORIN
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox