Skip to contentSkip to conversation

package/libglib2: bump to version 2.60.0

PATCH Superseded aduskett at gmail.com 2 participants 3 messages Apr 15, 2019 – Apr 26, 2019

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/libglib2: bump to version 2.60.0

From: Adam Duskett <[email protected]>

Changes include:
- Moving to the meson build system, as autoconf is no longer supported.
- Add 0002-Only-build-tests-if-certain-conditions-are-met.patch
- Add 0003-remove-cpp-requirement.patch because c++ is not needed.
- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch to prevent 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 as the switch to meson makes this obsolete.
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk

All tests pass:
./utils/test-pkg -c ./defconfig

           br-arm-full [1/6]: OK
br-arm-cortex-a9-glibc [2/6]: OK
 br-arm-cortex-m4-full [3/6]: SKIPPED
        br-x86-64-musl [4/6]: OK
    br-arm-full-static [5/6]: OK
          sourcery-arm [6/6]: OK

---
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)

 ...01-fix-compile-time-atomic-detection.patch |   2 +-
 ...-tests-if-certain-conditions-are-met.patch |  88 ++++++++++++++
 package/libglib2/0002-disable-tests.patch     |  60 ----------
 .../0003-remove-cpp-requirement.patch         |  96 +++++++++++++++
 ...mat-nonliteral-to-compiler-arguments.patch |  28 +++++
 ...dcode-python-path-into-various-tools.patch |  48 --------
 package/libglib2/libglib2.hash                |   2 +-
 package/libglib2/libglib2.mk                  | 110 +++---------------
 8 files changed, 230 insertions(+), 204 deletions(-)
 create mode 100644 package/libglib2/0002-Only-build-tests-if-certain-conditions-are-met.patch
 delete mode 100644 package/libglib2/0002-disable-tests.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 +1 -1
index 708188b2c1..68c9161ad2 100644
@@ -6,7 +6,7 @@ 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
+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-Only-build-tests-if-certain-conditions-are-met.patch new file +88 -0

88 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-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
new file mode 100644
index 0000000000..e51bb6b2b1
@@ -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/libglib2.hash +1 -1
index faa01ef563..4dea10933c 100644
@@ -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
+sha256  20865d8b96840d89d9340fc485b4b1131c1bb24d16a258a22d642c3bb1b44353  glib-2.60.0.tar.xz
 # License files, locally calculated
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/libglib2/libglib2.mk +16 -94

154 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH v3 1/1 package/libglib2: bump to version 2.60.0

Hello,

Quoted 14 lines · On Mon, 15 Apr 2019 18:55:41 -0400 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Changes include:
- Moving to the meson build system, as autoconf is no longer supported.
- Add 0002-Only-build-tests-if-certain-conditions-are-met.patch
- Add 0003-remove-cpp-requirement.patch because c++ is not needed.
- Add 0004-Add-Wno-format-nonliteral-to-compiler-arguments.patch to prevent 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 as the switch to meson makes this obsolete.
- Remove LIBGLIB2_AUTORECONF = YES from libglib2.mk
- Remove LIBGLIB2_INSTALL_STAGING_OPTS from libglib2.mk

Quoted 3 lines

All tests pass:
./utils/test-pkg -c ./defconfig

           br-arm-full [1/6]: OK

Unfortunately, the following defconfig doesn't build here:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2019.02-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_LIBGLIB2=y
# BR2_TARGET_ROOTFS_TAR is not set

It fails with:

[669/1014] Generating test_resources2.o with a custom command.
FAILED: gio/tests/test_resources2.o
objcopy --add-symbol _g_binary_test1_resource_data=.data:0 gio/tests/test_resources.o gio/tests/test_resources2.o
objcopy: unrecognized option '--add-symbol'
Usage: objcopy [option(s)] in-file [out-file]
Copies a binary file, possibly transforming it in the process
[...]
srec symbolsrec verilog tekhex binary ihex
[670/1014] Linking target gio/tests/async-close-output-stream.
[671/1014] Linking target gio/tests/contexts.
[672/1014] Linking target gio/tests/libresourceplugin.so.
[673/1014] Linking target gio/tests/cancellable.
[674/1014] Linking target gio/tests/buffered-output-stream.
[675/1014] Compiling C object 'gio/tests/bcb7ac7@@buffered-input-stream at exe/buffered-input-stream.c.o'.
[676/1014] Generating symbol file 'gio/tests/gdbus-object-manager-example/bfe1c9a@@gdbus-example-objectmanager at sha/libgdbus-example-objectmanager.so.symbols'. [677/1014] Compiling C object 'gio/tests/bcb7ac7@@converter-stream at exe/converter-stream.c.o'.
ninja: build stopped: subcommand failed.
make[1]: *** [/home/test/outputs/glib/build/host-libglib2-2.60.1/.stamp_built] Error 1

So, apparently, it's using the --add-symbol option of objcopy, which doesn't exist in this ancient objcopy version:

$ objcopy --version
GNU objcopy (GNU Binutils for Debian) 2.22

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v3 1/1 package/libglib2: bump to version 2.60.0

Hello,

Quoted 5 lines · On Fri, 26 Apr 2019 17:07:51 +0200 Thomas Petazzoni…

So, apparently, it's using the --add-symbol option of objcopy, which doesn't exist in this ancient objcopy version:

$ objcopy --version
GNU objcopy (GNU Binutils for Debian) 2.22

--add-symbol was added in binutils upstream by commit 2b35fb28f397a26c0da03f7579116d28af2af824, which first appeared in binutils 2.26. So it's expected that binutils 2.22 doesn't support this option.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com