package/libglib2: bump to version 2.60.3
v6 cover package/libglib2: bump to version 2.60.3
From: Adam Duskett <[email protected]>
I tested this patch with test-pkg -a to make sure that every single supported architecture is supported. The nds32 failure is because libffi does not support nds32, which libglib2 selects.
./utils/test-pkg -a -c ./defconfig -p libglib2
andes-nds32 [ 1/44]: FAILED
arm-aarch64 [ 2/44]: OK
br-aarch64-glibc [ 3/44]: OK
br-arcle-hs38 [ 4/44]: OK
br-arm-basic [ 5/44]: SKIPPED
br-arm-cortex-a9-glibc [ 6/44]: OK
br-arm-cortex-a9-musl [ 7/44]: OK
br-arm-cortex-m4-full [ 8/44]: SKIPPED
br-arm-full [ 9/44]: OK
br-arm-full-nothread [10/44]: SKIPPED
br-arm-full-static [11/44]: OK
br-i386-pentium4-full [12/44]: OK
br-i386-pentium-mmx-musl [13/44]: OK
br-m68k-5208-full [14/44]: SKIPPED
br-m68k-68040-full [15/44]: OK
br-microblazeel-full [16/44]: OK
br-mips32r6-el-hf-glibc [17/44]: OK
br-mips64-n64-full [18/44]: OK
br-mips64r6-el-hf-glibc [19/44]: OK
br-mipsel-o32-full [20/44]: OK
br-nios2-glibc [21/44]: OK
br-openrisc-uclibc [22/44]: OK
br-powerpc-603e-basic-cpp [23/44]: SKIPPED
br-powerpc64le-power8-glibc [24/44]: OK
br-powerpc64-power7-glibc [25/44]: OK
br-powerpc-e500mc-full [26/44]: OK
br-riscv32 [27/44]: OK
br-riscv64 [28/44]: OK
br-sh4-full [29/44]: OK
br-sparc64-glibc [30/44]: OK
br-sparc-uclibc [31/44]: OK
br-x86-64-core2-full [32/44]: OK
br-x86-64-musl [33/44]: OK
br-xtensa-full [34/44]: OK
linaro-aarch64-be [35/44]: OK
linaro-aarch64 [36/44]: OK
linaro-arm [37/44]: OK
sourcery-arm-armv4t [38/44]: OK
sourcery-arm [39/44]: OK
sourcery-arm-thumb2 [40/44]: OK
sourcery-mips64 [41/44]: OK
sourcery-mips [42/44]: OK
sourcery-nios2 [43/44]: OK
sourcery-x86-64 [44/44]: OKI ran the above on the following distributions:
- centos 6 (docker)
- centos 7 (docker)
- debian 8 (docker)
- ubuntu 14.04 (docker)
- Fedora 30 (Host machine)
I have also tested this with several packages that use libglib2, such as:
- gstreamer1
- wireshark
- gnupg
- docker
- dbus-glib
- network-manager
- refpolicy
- pcre2
- udisks
- gnupg
- gpsd
Any feedback would be appreciated!
Adam.
Adam Duskett (1):
package/libglib2: bump to version 2.60.3
...01-fix-compile-time-atomic-detection.patch | 4 +- .../0002-add-option-to-build-tests.patch | 103 +++++++++++++++ package/libglib2/0002-disable-tests.patch | 60 --------- ...03-gdbus-Avoid-printing-null-strings.patch | 73 ----------- .../0003-remove-cpp-requirement.patch | 96 ++++++++++++++ ...mat-nonliteral-to-compiler-arguments.patch | 28 ++++ ...dcode-python-path-into-various-tools.patch | 48 ------- package/libglib2/Config.in | 2 + package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 122 ++++-------------- 10 files changed, 261 insertions(+), 279 deletions(-) create mode 100644 package/libglib2/0002-add-option-to-build-tests.patch delete mode 100644 package/libglib2/0002-disable-tests.patch delete mode 100644 package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch create mode 100644 package/libglib2/0003-remove-cpp-requirement.patch create mode 100644 package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch delete mode 100644 package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch
Signature · 1 line
2.21.0
PATCH v6 1/1 package/libglib2: bump to version 2.60.3
From: Adam Duskett <[email protected]>
Changes include:
- Change the package type to meson, as autoconf is no longer supported.
- Add 0002-add-option-to-build-tests.patch
Upstream won't build tests when cross-compiling. However; this means still building the tests during a host build. Building the tests causes build failures on older distributions such as CentOS 6 and Debian 7 because of the command objcopy --add-symbol is used when building the test "test_resources2," which is not available with the older version of objcopy provided by the distributions.
- Add 0003-remove-cpp-requirement.patch:
C++ is not needed when just compiling. The inclusion of C++ in meson.build is to ensure libglib doesn't accidentally use C++ reserved keywords in public headers. Because tests aren't being compiled, there is no need for C++ as a requirement.
(https://gitlab.gnome.org/GNOME/glib/issues/1748)
- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch:
This prevents a false error when compiling against older gcc versions.
(https://gitlab.gnome.org/GNOME/glib/issues/1744)
- Remove 0004-Do-not-hardcode-python-path-into-various-tools.patch:
The switch to meson makes this obsolete.
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk:
Now that libglib2 is a meson package, there is no need for AUTORECONF.
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk:
Meson resolves these correctly.
- Add LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE in libglib2.mk:
Newer versions of libglib2 prefix glib-genmarshal, gobject-query, and glib-mkenums with ${bindir}. Unfortunately, this will resolve to the host systems /bin/ directory, which will cause compilation issues if the host does not have these programs. By removing the ${bindir}/ prefix, these programs are resolved in PATH instead.
---
v1 -> v2:
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk
- Remove -Dtests=false from libglib2.mk in favor of the updated 0002-Only-build-tests-if-certain-conditions-are-met.patch.
- Instead of making cpp optional, remove cpp requirement completely as the c++ requirement is for testing purposes only.
- Add a link to https://gitlab.gnome.org/GNOME/glib/issues/1748 as to why patch 0003 is buildroot specific.
- Update url in 0001-fix-compile-time-atomic-detection.patch
- Remove 0004-Do-not-hardcode-python-path-into-various-tools.patch (Arnout)
v2 -> v3:
- Moved -Wno-format-nonliteral above the comment. (Arnout)
v3 -> v4:
- Bump version from 2.60.0 to 2.60.1
v4 -> v5:
- Bump version from 2.60.1 to 2.60.2
- Replace 0002-Only-build-tests-if-certain-conditions-are-met.patch in favor of 0002-add-option-to-build-tests.patch. This allows tests to be disabled explicitly, and allows building on older distributions.
v5 -> v6:
- Bump version from 2.60.2 to 2.60.3
- Make a better commit log with more explination.
- Add LIBGLIB2_REMOVE_BINDIR_PREFIX_FROM_PC_FILE to fix finding glib-genmarshal. (Thanks to Arnout, Yann, and Thomas!)
...01-fix-compile-time-atomic-detection.patch | 4 +- .../0002-add-option-to-build-tests.patch | 103 +++++++++++++++ package/libglib2/0002-disable-tests.patch | 60 --------- ...03-gdbus-Avoid-printing-null-strings.patch | 73 ----------- .../0003-remove-cpp-requirement.patch | 96 ++++++++++++++ ...mat-nonliteral-to-compiler-arguments.patch | 28 ++++ ...dcode-python-path-into-various-tools.patch | 48 ------- package/libglib2/Config.in | 2 + package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 122 ++++-------------- 10 files changed, 261 insertions(+), 279 deletions(-) create mode 100644 package/libglib2/0002-add-option-to-build-tests.patch delete mode 100644 package/libglib2/0002-disable-tests.patch delete mode 100644 package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch create mode 100644 package/libglib2/0003-remove-cpp-requirement.patch create mode 100644 package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch delete mode 100644 package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch
package/libglib2/0001-fix-compile-time-atomic-detection.patch +2 -2
@@ -5,8 +5,8 @@ Subject: [PATCH] Fix compile time atomic detection Improved compile-time detection of atomic support in the compiler. -Upstream-Status: submitted -See : https://bugzilla.gnome.org/show_bug.cgi?id=752731 +Upstream-Status: Merged +See : https://gitlab.gnome.org/GNOME/glib/issues/1063 Signed-off-by: Brendan Heading <[email protected]> Signed-off-by: Adam Duskett <[email protected]>
package/libglib2/0002-add-option-to-build-tests.patch new file +103 -0
103 lines not on this page · raw message
package/libglib2/0002-disable-tests.patch deleted +0 -60
60 lines not on this page · raw message
package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch deleted +0 -73
73 lines not on this page · raw message
package/libglib2/0003-remove-cpp-requirement.patch new file +96 -0
96 lines not on this page · raw message
package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 9e0f11a4981737f98bac93a22b6f2ff1a3887b63 Mon Sep 17 00:00:00 2001 +From: Adam Duskett <[email protected]> +Date: Tue, 9 Apr 2019 13:03:51 -0400 +Subject: [PATCH] Add '-Wno-format-nonliteral' to compiler arguments. + +This warning is a false positive on older versions of gcc. +See https://gitlab.gnome.org/GNOME/glib/issues/1744 for more details. + +Signed-off-by: Adam Duskett <[email protected]> +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 3c615b7..7cae4e8 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,6 +357,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: + # https://wiki.gnome.org/Projects/GLib/CompilerRequirements#Function_pointer_conversions. + '-Wno-pedantic', + '-Werror=declaration-after-statement', + '-Werror=format=2', +-- +2.20.1 +
package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch deleted +0 -48
48 lines not on this page · raw message
package/libglib2/Config.in +2 -0
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBGLIB2 depends on BR2_USE_WCHAR # gettext depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() + depends on !BR2_nds32 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_PCRE
@@ -16,5 +17,6 @@ config BR2_PACKAGE_LIBGLIB2 http://www.gtk.org/ comment "libglib2 needs a toolchain w/ wchar, threads" + depends on !BR2_nds32 depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/libglib2/libglib2.hash +2 -2
@@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.56/glib-2.56.4.sha256sum -sha256 27f703d125efb07f8a743666b580df0b4095c59fc8750e8890132c91d437504c glib-2.56.4.tar.xz +# https://download.gnome.org/sources/glib/2.60/glib-2.60.3.sha256sum +sha256 04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9 glib-2.60.3.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
package/libglib2/libglib2.mk +28 -94
172 lines not on this page · raw message
Signature · 1 line
2.21.0
v6 cover package/libglib2: bump to version 2.60.3
In reply to aduskett at gmail.comUgh, please use V7, I missed a few small lines in Config.in that I had put there for debugging.
https://patchwork.ozlabs.org/patch/1106520/
Quoted 101 lines · On Tue, May 28, 2019 at 3:40 PM <[email protected]> wrote:
From: Adam Duskett <[email protected]>
I tested this patch with test-pkg -a to make sure that every single supported architecture is supported. The nds32 failure is because libffi does not support nds32, which libglib2 selects.
./utils/test-pkg -a -c ./defconfig -p libglib2
andes-nds32 [ 1/44]: FAILED arm-aarch64 [ 2/44]: OK br-aarch64-glibc [ 3/44]: OK br-arcle-hs38 [ 4/44]: OK br-arm-basic [ 5/44]: SKIPPED br-arm-cortex-a9-glibc [ 6/44]: OK br-arm-cortex-a9-musl [ 7/44]: OK br-arm-cortex-m4-full [ 8/44]: SKIPPED br-arm-full [ 9/44]: OK br-arm-full-nothread [10/44]: SKIPPED br-arm-full-static [11/44]: OK br-i386-pentium4-full [12/44]: OK br-i386-pentium-mmx-musl [13/44]: OK br-m68k-5208-full [14/44]: SKIPPED br-m68k-68040-full [15/44]: OK br-microblazeel-full [16/44]: OK br-mips32r6-el-hf-glibc [17/44]: OK br-mips64-n64-full [18/44]: OK br-mips64r6-el-hf-glibc [19/44]: OK br-mipsel-o32-full [20/44]: OK br-nios2-glibc [21/44]: OK br-openrisc-uclibc [22/44]: OK br-powerpc-603e-basic-cpp [23/44]: SKIPPED br-powerpc64le-power8-glibc [24/44]: OK br-powerpc64-power7-glibc [25/44]: OK br-powerpc-e500mc-full [26/44]: OK br-riscv32 [27/44]: OK br-riscv64 [28/44]: OK br-sh4-full [29/44]: OK br-sparc64-glibc [30/44]: OK br-sparc-uclibc [31/44]: OK br-x86-64-core2-full [32/44]: OK br-x86-64-musl [33/44]: OK br-xtensa-full [34/44]: OK linaro-aarch64-be [35/44]: OK linaro-aarch64 [36/44]: OK linaro-arm [37/44]: OK sourcery-arm-armv4t [38/44]: OK sourcery-arm [39/44]: OK sourcery-arm-thumb2 [40/44]: OK sourcery-mips64 [41/44]: OK sourcery-mips [42/44]: OK sourcery-nios2 [43/44]: OK sourcery-x86-64 [44/44]: OKI ran the above on the following distributions:
- centos 6 (docker)
- centos 7 (docker)
- debian 8 (docker)
- ubuntu 14.04 (docker)
- Fedora 30 (Host machine)I have also tested this with several packages that use libglib2, such as:
- gstreamer1
- wireshark
- gnupg
- docker
- dbus-glib
- network-manager
- refpolicy
- pcre2
- udisks
- gnupg
- gpsdAny feedback would be appreciated!
Adam.
Adam Duskett (1):
package/libglib2: bump to version 2.60.3...01-fix-compile-time-atomic-detection.patch | 4 +- .../0002-add-option-to-build-tests.patch | 103 +++++++++++++++ package/libglib2/0002-disable-tests.patch | 60 --------- ...03-gdbus-Avoid-printing-null-strings.patch | 73 ----------- .../0003-remove-cpp-requirement.patch | 96 ++++++++++++++ ...mat-nonliteral-to-compiler-arguments.patch | 28 ++++ ...dcode-python-path-into-various-tools.patch | 48 ------- package/libglib2/Config.in | 2 + package/libglib2/libglib2.hash | 4 +- package/libglib2/libglib2.mk | 122 ++++-------------- 10 files changed, 261 insertions(+), 279 deletions(-) create mode 100644 package/libglib2/0002-add-option-to-build-tests.patch delete mode 100644 package/libglib2/0002-disable-tests.patch delete mode 100644 package/libglib2/0003-gdbus-Avoid-printing-null-strings.patch create mode 100644 package/libglib2/0003-remove-cpp-requirement.patch create mode 100644 package/libglib2/0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch delete mode 100644 package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch--
2.21.0