From e6e9260b97d873f14991a1143f1bda5b1b624955 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 9 Nov 2015 11:17:07 +0200 Subject: glib-2.0: Enable more tests while cross-compiling Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- .../Enable-more-tests-while-cross-compiling.patch | 81 ++++++++++++++++++++++ meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb | 1 + 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch (limited to 'meta') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch new file mode 100644 index 0000000000..f1e688cacf --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -0,0 +1,81 @@ +From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Mon, 9 Nov 2015 11:07:27 +0200 +Subject: [PATCH] Enable more tests while cross-compiling + +Upstream disables a few tests while cross-compiling because their build requires +running other built binaries. This usually makes sense but in the cross-compile +case we can depend on glib-2.0-native. + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Jussi Kukkonen +--- + gio/tests/Makefile.am | 8 +++----- + tests/gobject/Makefile.am | 8 +++----- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index 868873f..533e454 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -503,10 +503,9 @@ test_programs += \ + endif + + # ----------------------------------------------------------------------------- +-# The resources test is a bit more complicated, and we cannot build it when +-# cross-compiling GIO because it requires running a binary... ++# The resources test is a bit more complicated, and requires glib-native ++# for running a binary + +-if !CROSS_COMPILING + test_programs += resources + resources_SOURCES = resources.c + nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h +@@ -528,7 +527,11 @@ if !ENABLE_INSTALLED_TESTS + libresourceplugin_la_LDFLAGS += -rpath / + endif + ++if !CROSS_COMPILING + glib_compile_resources=$(top_builddir)/gio/glib-compile-resources ++else ++glib_compile_resources=glib-compile-resources ++endif + + resources.o: test_resources2.h + test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/test2.gresource.xml) +@@ -545,7 +548,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- + + EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml + CLEANFILES += test_resources.c test_resources2.[ch] plugin_resources.c test.gresource +-endif # !CROSS_COMPILING + + BUILT_SOURCES += giotypefuncs.c + +diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am +index 16f2827..4c2208e 100644 +--- a/tests/gobject/Makefile.am ++++ b/tests/gobject/Makefile.am +@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP + installed_test_programs += timeloop-closure + endif + +-# The marshal test requires running a binary, which means we cannot +-# build it when cross-compiling ++# The marshal test requires running a binary, which means we require ++# glib-native when cross-compiling + if !CROSS_COMPILING + glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal ++else ++glib_genmarshal=$(shell which glib-genmarshal) ++endif + + testmarshal.h: stamp-testmarshal.h + @true +@@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c + CLEANFILES += stamp-testmarshal.h + EXTRA_DIST += testcommon.h testmarshal.list + BUILT_EXTRA_DIST += testmarshal.h testmarshal.c +-endif # !CROSS_COMPILING + + dist-hook: $(BUILT_EXTRA_DIST) + files='$(BUILT_EXTRA_DIST)'; \ diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb index 22fd34a6ff..04951f4b6f 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.46.1.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://allow-run-media-sdX-drive-mount-if-username-root.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://0001-gio-tests-Don-t-depend-on-a-data-file-that-s-not-bui.patch \ + file://Enable-more-tests-while-cross-compiling.patch \ " SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" -- cgit 1.2.3-korg