package/libglib2: bump to version 2.64.0
PATCH 1/1 package/libglib2: bump to version 2.64.0
--- .../libglib2/0003-remove-cpp-requirement.patch | 18 +++++++++--------- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-)
package/libglib2/0003-remove-cpp-requirement.patch +9 -9
@@ -1,4 +1,4 @@ -From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 +From 5bad146ac17586f3f46d64ec927a11d25845810f Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> Date: Mon, 16 Sep 2019 10:12:38 -0700 Subject: [PATCH] remove cpp requirement
@@ -17,7 +17,7 @@ https://gitlab.gnome.org/GNOME/glib/issues/1748 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in -index 7ef8c48..128e65d 100644 +index 7ef8c481d..128e65d96 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in @@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr;
@@ -29,13 +29,13 @@ 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 60f7ce887..d3d84726c 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.62.4', + version : '2.64.0', # NOTE: We keep this pinned at 0.49 because that's what Debian 10 ships meson_version : '>= 0.49.2', @@ -10,7 +10,6 @@ project('glib', 'c', 'cpp',
@@ -46,7 +46,7 @@ index 4bbf4c2..ac59f4e 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1484,20 +1483,6 @@ if g_have_iso_c_varargs +@@ -1548,20 +1547,6 @@ if g_have_iso_c_varargs #endif''') endif
@@ -67,7 +67,7 @@ index 4bbf4c2..ac59f4e 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -2095,7 +2080,6 @@ subdir('gobject') +@@ -2167,7 +2152,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio')
@@ -76,10 +76,10 @@ index 4bbf4c2..ac59f4e 100644 subdir('tests') endif diff --git a/tests/meson.build b/tests/meson.build -index e4ea226..7fd974c 100644 +index 6741f8f52..316cf2527 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -56,11 +56,6 @@ tests = { +@@ -55,11 +55,6 @@ tests = { 'source': 'module-test.c', 'c_args': ['-DMODULE_TYPE="plugin"'], },
@@ -92,5 +92,5 @@ index e4ea226..7fd974c 100644 test_extra_programs = { -- -2.23.0 +2.20.1
package/libglib2/libglib2.hash +2 -2
@@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.62/glib-2.62.4.sha256sum -sha256 4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc glib-2.62.4.tar.xz +# https://download.gnome.org/sources/glib/2.64/glib-2.64.0.sha256sum +sha256 e5e514e47d169cdb4111c3ea4af0300e1b1a5f428a474d2d7ddadf38dd061280 glib-2.64.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/libglib2/libglib2.mk +4 -4
@@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.62 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.64 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0 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+
@@ -80,10 +80,10 @@ endef endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) -LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_CONF_OPTS += -Dlibmount=enabled LIBGLIB2_DEPENDENCIES += util-linux else -LIBGLIB2_CONF_OPTS += -Dlibmount=false +LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif # Purge useless binaries from target
Signature · 1 line
2.20.1
PATCH 1/1 package/libglib2: bump to version 2.64.0
package/libglib2/libglib2.mk endef · line 87
Quoted 8 lines · On Fri, 6 Mar 2020 14:14:58 -0700 James Hilliard <[email protected]>…
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
package/libglib2/libglib2.mk +2
-2-LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_CONF_OPTS += -Dlibmount=enabled LIBGLIB2_DEPENDENCIES += util-linux else -LIBGLIB2_CONF_OPTS += -Dlibmount=false +LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif
Any reason for this change ? It is not explained in the commit log, and it's not obvious why it is needed.
Could you give a few more details?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/libglib2: bump to version 2.64.0
Hello Thomas,
Quoted 15 lines · Thomas Petazzoni
package/libglib2/libglib2.mk endef · line 87
Quoted 8 lines · On Fri, 6 Mar 2020 14:14:58 -0700 James Hilliard <[email protected]>…
ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y)
package/libglib2/libglib2.mk +2
-2-LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_CONF_OPTS += -Dlibmount=enabled LIBGLIB2_DEPENDENCIES += util-linux else -LIBGLIB2_CONF_OPTS += -Dlibmount=false +LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endifAny reason for this change ? It is not explained in the commit log, and it's not obvious why it is needed.
Quoted 1 line
Could you give a few more details?
The option was changed from type boolean to type feature:
-- build/libglib2-2.62.4/meson_options.txt 2019-12-19 17:33:15.000000000 +0100
+++ build/libglib2-2.64.0/meson_options.txt 2020-02-27 17:12:52.000000000 +0100
@@ -30,8 +30,8 @@
description : 'build with xattr support')
option('libmount',
- type : 'boolean', - value : true, + type : 'feature', + value : 'auto',
description : 'build with libmount support')
option('internal_pcre',
Regards,
Peter
Quoted 4 lines
Thanks,
Thomas
PATCH 1/1 package/libglib2: bump to version 2.64.0
In reply to James HilliardJames, All,
On 2020-03-06 14:14 -0700, James Hilliard spake thusly:
Quoted 6 lines
Signed-off-by James Hilliard <[email protected]>--- .../libglib2/0003-remove-cpp-requirement.patch | 18 +++++++++--------- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-)
[--SNIP--]
package/libglib2/libglib2.mk line 8
Quoted 12 lines
package/libglib2/libglib2.mk +2
-2@@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.62 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 +LIBGLIB2_VERSION_MAJOR = 2.64 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).0
In the meantime. Adam has sent his own attempt at the bump, with a commit log that explains the switch to afeature, and to a more recent release, 2.64.1.
So I'm working on Adam's patch, and I've marked yours as superseded.
Regards,
Yann E. MORIN.
Quoted 23 lines
package/libglib2/libglib2.mk +2
-2LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+@@ -80,10 +80,10 @@ endef endif ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) -LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_CONF_OPTS += -Dlibmount=enabled LIBGLIB2_DEPENDENCIES += util-linux else -LIBGLIB2_CONF_OPTS += -Dlibmount=false +LIBGLIB2_CONF_OPTS += -Dlibmount=disabled endif # Purge useless binaries from targetSignature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'