package/libglib2: bump to version 2.62.0
PATCH 1/2 package/libglib2: bump to version 2.62.0
From: Adam Duskett <[email protected]>
Other changes:
- Refactor 0002-add-option-to-build-tests.patch to work with the new version.
- Add the new option oss_fuzz=disabled to HOST_LIBGLIB2_CONF_OPTS and LIBGLIB2_CONF_OPTS.
- Change -Diconv=gnu to -Diconv=external as the option has changed.
--- ...01-fix-compile-time-atomic-detection.patch | 2 +- .../0002-add-option-to-build-tests.patch | 94 +++++++------------ .../0003-remove-cpp-requirement.patch | 30 +++--- ...mat-nonliteral-to-compiler-arguments.patch | 2 +- package/libglib2/libglib2.hash | 2 +- package/libglib2/libglib2.mk | 12 ++- 6 files changed, 60 insertions(+), 82 deletions(-)
package/libglib2/0001-fix-compile-time-atomic-detection.patch +1 -1
@@ -18,7 +18,7 @@ diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c index 71a6b7b..d09d029 100644 --- a/glib/gthread-posix.c +++ b/glib/gthread-posix.c -@@ -65,7 +65,7 @@ +@@ -68,7 +68,7 @@ #endif /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
package/libglib2/0002-add-option-to-build-tests.patch +35 -59
130 lines not on this page · raw message
package/libglib2/0003-remove-cpp-requirement.patch +15 -15
@@ -1,6 +1,6 @@ -From ee5ed1385bd6c36123ff970a8fff89a811798421 Mon Sep 17 00:00:00 2001 +From 2f168951df1feebeac549ada1ea44ea092484c54 Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> -Date: Tue, 9 Apr 2019 12:59:36 -0400 +Date: Mon, 16 Sep 2019 10:12:38 -0700 Subject: [PATCH] remove cpp requirement The c++ test is necessary to ensure libglib doesn't accidentally use C++
@@ -17,10 +17,10 @@ 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 2bf6c43..358867f 100644 +index 7ef8c48..128e65d 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in -@@ -122,7 +122,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; +@@ -117,7 +117,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; @glib_vacopy@ @g_have_iso_c_varargs@
@@ -29,16 +29,16 @@ index 2bf6c43..358867f 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 c96289a..b694bb7 100644 +index 3124f28..642afb8 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('glib', 'c', 'cpp', +project('glib', 'c', - version : '2.60.7', - meson_version : '>= 0.48.0', - default_options : [ -@@ -9,7 +9,6 @@ project('glib', 'c', 'cpp', + version : '2.62.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', ) cc = meson.get_compiler('c')
@@ -46,7 +46,7 @@ index c96289a..b694bb7 100644 cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper() -@@ -1440,20 +1439,6 @@ if g_have_iso_c_varargs +@@ -1487,20 +1486,6 @@ if g_have_iso_c_varargs #endif''') endif
@@ -67,16 +67,16 @@ index c96289a..b694bb7 100644 g_have_gnuc_varargs = cc.compiles(''' void some_func (void) { int a(int p1, int p2, int p3); -@@ -1995,7 +1980,6 @@ subdir('gobject') +@@ -2096,7 +2081,6 @@ subdir('gobject') subdir('gthread') subdir('gmodule') subdir('gio') -subdir('fuzzing') - + # Don?t build the tests unless we can run them (either natively or in an exe wrapper) + build_tests = get_option('tests') if build_tests - subdir('tests') diff --git a/tests/meson.build b/tests/meson.build -index 11075dd..e052892 100644 +index ce30442..2b31427 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -48,11 +48,6 @@ tests = {
@@ -92,5 +92,5 @@ index 11075dd..e052892 100644 test_extra_programs = { -- -2.20.1 +2.21.0
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch +1 -1
@@ -15,7 +15,7 @@ diff --git a/meson.build b/meson.build index 3c615b7..7cae4e8 100644 --- a/meson.build +++ b/meson.build -@@ -359,6 +359,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' +@@ -369,6 +369,7 @@ if cc.get_id() == 'gcc' or cc.get_id() == 'clang' '-Wno-cast-function-type', + '-Wno-format-nonliteral', # Due to function casts through (void*) we cannot support -Wpedantic:
package/libglib2/libglib2.hash +1 -1
@@ -1,4 +1,4 @@ # https://download.gnome.org/sources/glib/2.60/glib-2.60.6.sha256sum -sha256 8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310 glib-2.60.7.tar.xz +sha256 6c257205a0a343b662c9961a58bb4ba1f1e31c82f5c6b909ec741194abc3da10 glib-2.62.0.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/libglib2/libglib2.mk +7 -5
@@ -4,8 +4,8 @@ # ################################################################################ -LIBGLIB2_VERSION_MAJOR = 2.60 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).7 +LIBGLIB2_VERSION_MAJOR = 2.62 +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+
@@ -28,7 +28,8 @@ HOST_LIBGLIB2_CONF_OPTS = \ -Dxattr=false \ -Dinternal_pcre=false \ -Dinstalled_tests=false \ - -Dtests=false + -Dtests=false \ + -Doss_fuzz=disabled LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 \
@@ -49,7 +50,8 @@ HOST_LIBGLIB2_DEPENDENCIES = \ LIBGLIB2_CONF_OPTS = \ -Dinternal_pcre=false \ -Dgio_module_dir=/usr/lib/gio/modules \ - -Dtests=false + -Dtests=false \ + -Doss_fuzz=disabled ifneq ($(BR2_ENABLE_LOCALE),y) LIBGLIB2_DEPENDENCIES += libiconv
@@ -60,7 +62,7 @@ LIBGLIB2_DEPENDENCIES += elfutils endif ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBGLIB2_CONF_OPTS += -Diconv=gnu +LIBGLIB2_CONF_OPTS += -Diconv=external LIBGLIB2_DEPENDENCIES += libiconv endif
Signature · 1 line
2.21.0
PATCH 2/2 package/libglib2: Do not depend on util-linux
From: Adam Duskett <[email protected]>
libglib2 needs util-linux only for libmount, which is a configuration option. Instead, check if util-linux-libmount is selected, and if so, set the option to true.
--- package/libglib2/Config.in | 2 -- package/libglib2/libglib2.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
package/libglib2/Config.in +0 -2
@@ -7,8 +7,6 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_ZLIB help Low-level core library that forms the basis of GTK+ and GNOME.
package/libglib2/libglib2.mk +9 -1
@@ -33,7 +33,7 @@ HOST_LIBGLIB2_CONF_OPTS = \ LIBGLIB2_DEPENDENCIES = \ host-pkgconf host-libglib2 \ - libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES) + libffi pcre zlib $(TARGET_NLS_DEPENDENCIES) HOST_LIBGLIB2_DEPENDENCIES = \ host-gettext \
@@ -80,6 +80,14 @@ define LIBGLIB2_REMOVE_GDB_FILES endef endif +ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) +LIBGLIB2_CONF_OPTS += -Dlibmount=true +LIBGLIB2_DEPENDENCIES += util-linux +else +LIBGLIB2_CONF_OPTS += -Dlibmount=false +endif + + # Purge useless binaries from target define LIBGLIB2_REMOVE_DEV_FILES rm -rf $(TARGET_DIR)/usr/lib/glib-2.0
Signature · 1 line
2.21.0
PATCH 2/2 package/libglib2: Do not depend on util-linux
Quoted 11 lines · On Mon, 16 Sep 2019 12:16:05 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
libglib2 needs util-linux only for libmount, which is a configuration option. Instead, check if util-linux-libmount is selected, and if so, set the option to true.
Signed-off-by Adam Duskett <[email protected]>--- package/libglib2/Config.in | 2 -- package/libglib2/libglib2.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
Applied to master, thanks. This may cause problems for people who currently needed libmount, but do not have anything else in their configuration that selects util-linux libmount option. Their next Buildroot build will silently no longer have libmount support.
However, we don't really have a good way to handle such dependencies that used to be mandatory and become optional, so there's not much we can do about it.
We might however see a few build issues from reverse dependencies of libglib2 that do need libmount. Such reverse dependencies will have to select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT by themselves.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/libglib2: Do not depend on util-linux
Quoted 21 lines · Thomas Petazzoni
Quoted 11 lines · On Mon, 16 Sep 2019 12:16:05 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
libglib2 needs util-linux only for libmount, which is a configuration option. Instead, check if util-linux-libmount is selected, and if so, set the option to true.
Signed-off-by Adam Duskett <[email protected]>--- package/libglib2/Config.in | 2 -- package/libglib2/libglib2.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)Applied to master, thanks. This may cause problems for people who currently needed libmount, but do not have anything else in their configuration that selects util-linux libmount option. Their next Buildroot build will silently no longer have libmount support.
Quoted 7 lines
However, we don't really have a good way to handle such dependencies that used to be mandatory and become optional, so there's not much we can do about it.
We might however see a few build issues from reverse dependencies of libglib2 that do need libmount. Such reverse dependencies will have to select
BR2_PACKAGE_UTIL_LINUX_LIBMOUNTby themselves.
Yet another candidate to depend on the impending util-linux-libs.
Signature · 1 line
Carlos Santos <[email protected]>
PATCH 2/2 package/libglib2: Do not depend on util-linux
Quoted 9 lines · On Tue, 17 Sep 2019 17:32:03 -0300 Carlos Santos <[email protected]> wrote:
Quoted 9 lines
Applied to master, thanks. This may cause problems for people who currently needed libmount, but do not have anything else in their configuration that selects util-linux libmount option. Their next Buildroot build will silently no longer have libmount support.
However, we don't really have a good way to handle such dependencies that used to be mandatory and become optional, so there's not much we can do about it.
Quoted 5 lines
Quoted 3 lines
We might however see a few build issues from reverse dependencies of libglib2 that do need libmount. Such reverse dependencies will have to select
BR2_PACKAGE_UTIL_LINUX_LIBMOUNTby themselves.Yet another candidate to depend on the impending util-linux-libs.
Indeed, but I don't see how util-linux-libs would have helped handling "legacy" configurations in the transition from util-linux-libs being a mandatory dependency to util-linux-libs becoming an optional dependency. But I could be missing something here, it's getting late for me.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/2 package/libglib2: Do not depend on util-linux
In reply to Thomas PetazzoniQuoted 15 lines · Thomas Petazzoni
Quoted 11 lines · On Mon, 16 Sep 2019 12:16:05 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
libglib2 needs util-linux only for libmount, which is a configuration option. Instead, check if util-linux-libmount is selected, and if so, set the option to true.
Signed-off-by Adam Duskett <[email protected]>--- package/libglib2/Config.in | 2 -- package/libglib2/libglib2.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
Quoted 4 lines
Applied to master, thanks. This may cause problems for people who currently needed libmount, but do not have anything else in their configuration that selects util-linux libmount option. Their next Buildroot build will silently no longer have libmount support.
Begging to differ: when bumping Buildroot version, you should *always* use a
full config, not a defconfig. So libmount will remain selected.
Regards,
Arnout
Quoted 10 lines
However, we don't really have a good way to handle such dependencies that used to be mandatory and become optional, so there's not much we can do about it.
We might however see a few build issues from reverse dependencies of libglib2 that do need libmount. Such reverse dependencies will have to select
BR2_PACKAGE_UTIL_LINUX_LIBMOUNTby themselves.Thomas
PATCH 2/2 package/libglib2: Do not depend on util-linux
Quoted 7 lines · On Tue, 17 Sep 2019 23:50:33 +0200 Arnout Vandecappelle <[email protected]> wrote:
Quoted 4 lines
Applied to master, thanks. This may cause problems for people who currently needed libmount, but do not have anything else in their configuration that selects util-linux libmount option. Their next Buildroot build will silently no longer have libmount support.
Begging to differ: when bumping Buildroot version, you should *always* use a
full config, not a defconfig. So libmount will remain selected.
Indeed, with a full config, it will be preserved. But I'm pretty sure lots of people have a defconfig, and use that across a Buildroot upgrade.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/2 package/libglib2: bump to version 2.62.0
In reply to aduskett at gmail.comQuoted 9 lines · On Mon, 16 Sep 2019 12:16:04 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
Other changes:
- Refactor 0002-add-option-to-build-tests.patch to work with the new version.
- Add the new option oss_fuzz=disabled toHOST_LIBGLIB2_CONF_OPTSandLIBGLIB2_CONF_OPTS.
- Change -Diconv=gnu to -Diconv=external as the option has changed.Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines
--- ...01-fix-compile-time-atomic-detection.patch | 2 +- .../0002-add-option-to-build-tests.patch | 94 +++++++------------ .../0003-remove-cpp-requirement.patch | 30 +++--- ...mat-nonliteral-to-compiler-arguments.patch | 2 +- package/libglib2/libglib2.hash | 2 +- package/libglib2/libglib2.mk | 12 ++- 6 files changed, 60 insertions(+), 82 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com