diff --git a/package/libglib2/0002-add-option-to-build-tests.patch b/package/libglib2/0002-add-option-to-build-tests.patch index 3b7d6753ca..5caaaff6b2 100644 --- a/package/libglib2/0002-add-option-to-build-tests.patch +++ b/package/libglib2/0002-add-option-to-build-tests.patch @@ -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 -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 --- - 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