package/libglib2: fix building on older distributions
PATCH 1/1 package/libglib2: fix building on older distributions
From: Adam Duskett <[email protected]>
When updating to libglib2 2.62.0, the file 0002-add-option-to-build-tests.patch had to be refactored to work with the new build_tests checks. In the process of refactoring, a missing check was overlooked in glib/meson.build causing distributions with older versions of objcopy to fail because the older version does not contain the --add-symbol argument.
Adding the check for the build_tests argument fixes the issue.
Fixes:
http://autobuild.buildroot.net/results/dcc2352a036aba9650eae8abaaa23819fc67332d
--- .../0002-add-option-to-build-tests.patch | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-)
package/libglib2/0002-add-option-to-build-tests.patch +22 -7
@@ -1,6 +1,6 @@ -From 3a137f52869fdbc7050d606bfba0e5b1e41bd8e6 Mon Sep 17 00:00:00 2001 +From cdccbc6ec36243463613cb32d7058c26c3c51e16 Mon Sep 17 00:00:00 2001 From: Adam Duskett <[email protected]> -Date: Mon, 16 Sep 2019 10:08:52 -0700 +Date: Wed, 18 Sep 2019 09:50:00 -0700 Subject: [PATCH] add option to build tests. Upstream won't build tests when cross-compiling. However; this means still
@@ -15,11 +15,12 @@ building any tests, even when building the host variant. Signed-off-by: Adam Duskett <[email protected]> --- - gio/meson.build | 1 - - gobject/meson.build | 1 - - meson.build | 2 +- - meson_options.txt | 5 +++++ - 4 files changed, 6 insertions(+), 3 deletions(-) + gio/meson.build | 1 - + glib/meson.build | 3 +- + gobject/meson.build | 1 - + meson.build | 2 +- + meson_options.txt | 5 +++++ + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gio/meson.build b/gio/meson.build index 9a9e621..6adc014 100644
@@ -33,6 +34,20 @@ index 9a9e621..6adc014 100644 if build_tests subdir('tests') endif +diff --git a/glib/meson.build b/glib/meson.build +index 91a48f1..230d562 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -458,8 +458,7 @@ if enable_systemtap + ) + endif + +-# Don?t build the tests unless we can run them (either natively or in an exe wrapper) +-build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) ++build_tests = get_option('tests') + if build_tests + subdir('tests') + endif diff --git a/gobject/meson.build b/gobject/meson.build index c7805c5..fb5874d 100644 --- a/gobject/meson.build
Signature · 1 line
2.21.0
Thomas Petazzoni
AppliedPATCH 1/1 package/libglib2: fix building on older distributions
Quoted 10 lines · On Wed, 18 Sep 2019 10:03:29 -0700 aduskett at gmail.com wrote:
From: Adam Duskett <[email protected]>
When updating to libglib2 2.62.0, the file 0002-add-option-to-build-tests.patch had to be refactored to work with the new
build_testschecks. In the process of refactoring, a missing check was overlooked in glib/meson.build causing distributions with older versions of objcopy to fail because the older version does not contain the --add-symbol argument.Adding the check for the
build_testsargument fixes the issue.
Quoted 7 lines
Fixes:
http://autobuild.buildroot.net/results/dcc2352a036aba9650eae8abaaa23819fc67332dSigned-off-by Adam Duskett <[email protected]>--- .../0002-add-option-to-build-tests.patch | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com