Skip to contentSkip to conversation

package/libglib2: bump to version 2.60.2

PATCH Superseded aduskett at gmail.com 2 participants 2 messages May 8, 2019 – May 27, 2019

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 package/libglib2: bump to version 2.60.2

From: Adam Duskett <[email protected]>

Changes include:
- Moving to the meson build system, as autoconf is no longer supported.
- Add 0002-add-option-to-build-tests.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)

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.

 ...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/libglib2.hash                |   4 +-
 package/libglib2/libglib2.mk                  | 112 +++---------------
 9 files changed, 249 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
index 708188b2c1..527757d9c5 100644
@@ -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
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 +2 -2
index faa01ef563..54a0fc8621 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
+# https://download.gnome.org/sources/glib/2.60/glib-2.60.2.sha256sum
+sha256  2ef15475060addfda0443a7e8a52b28a10d5e981e82c083034061daf9a8f80d9  glib-2.60.2.tar.xz
 # License files, locally calculated
 sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
package/libglib2/libglib2.mk +18 -94

156 lines not on this page · raw message

Signature · 1 line
2.21.0
#1 lore raw

PATCH v5 1/1 package/libglib2: bump to version 2.60.2

Hello Adam,

Quoted 16 lines · On Wed, 8 May 2019 15:46:02 -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-add-option-to-build-tests.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

Quoted 8 lines
           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

Thanks for this new iteration. libglib2 now builds fine for me, but dbus-glib no longer builds properly after this patch. It fails like this:

Making all in statemachine
make[6]: Entering directory `/home/test/buildroot/output/build/dbus-glib-0.110/dbus/examples/statemachine'
/bin/bash ../../../libtool --mode=execute /home/test/buildroot/output/host/bin/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=statemachine-server-glue.h statemachine-server.xml /bin/bash ../../../libtool --mode=execute /home/test/buildroot/output/host/bin/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=statemachine-glue.h statemachine.xml echo "#include <config.h>" > sm-marshal.c.tmp
/usr/bin/glib-genmarshal --prefix=sm_marshal ./sm-marshal.list --header > sm-marshal.h.tmp && mv sm-marshal.h.tmp sm-marshal.h
/bin/bash: /usr/bin/glib-genmarshal: No such file or directory
/usr/bin/glib-genmarshal --prefix=sm_marshal ./sm-marshal.list --header --body >> sm-marshal.c.tmp
make[6]: *** [sm-marshal.h] Error 127
make[6]: *** Waiting for unfinished jobs....
/bin/bash: /usr/bin/glib-genmarshal: No such file or directory
make[6]: *** [sm-marshal.c] Error 127
WARNING: Using --header and --body at the same time is deprecated; use --body --prototypes instead
INFO: Reading /tmp/dbus-binding-tool-c-marshallers.A90E2Z...
WARNING: Using --header and --body at the same time is deprecated; use --body --prototypes instead
INFO: Reading /tmp/dbus-binding-tool-c-marshallers.ZX3B2Z...
make[6]: Leaving directory `/home/test/buildroot/output/build/dbus-glib-0.110/dbus/examples/statemachine'
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory `/home/test/buildroot/output/build/dbus-glib-0.110/dbus/examples'
make[4]: *** [all] Error 2
make[4]: Leaving directory `/home/test/buildroot/output/build/dbus-glib-0.110/dbus/examples'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/test/buildroot/output/build/dbus-glib-0.110/dbus'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/test/buildroot/output/build/dbus-glib-0.110'

With the following defconfig:

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_LATENCYTOP=y
BR2_PACKAGE_DBUS_GLIB=y
BR2_PACKAGE_NEARD=y
BR2_PACKAGE_NEARD_TOOLS=y
BR2_PACKAGE_LENSFUN=y
BR2_PACKAGE_LIBCROCO=y
# BR2_TARGET_ROOTFS_TAR is not set

while it builds fine without your libglib2 bump :-/

Best regards,

Thomas

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