diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch')
| -rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 30 |
1 files changed, 17 insertions, 13 deletions
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 index 9b4ded14d5..b98f933dae 100644 --- 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 @@ -1,7 +1,7 @@ -From 310dfe1bdd16d4b254732fcc202c6211629bc7b6 Mon Sep 17 00:00:00 2001 +From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH] Enable more tests while cross-compiling +Subject: [PATCH 06/10] 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 @@ -9,16 +9,17 @@ case we can depend on glib-2.0-native. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- - gio/tests/Makefile.am | 8 +++----- - tests/gobject/Makefile.am | 8 +++----- - 2 files changed, 6 insertions(+), 10 deletions(-) + gio/tests/Makefile.am | 10 ++++++---- + tests/gobject/Makefile.am | 8 +++++--- + 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index 868873f..533e454 100644 +index acc1da4..9176640 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -503,10 +503,9 @@ test_programs += \ +@@ -516,10 +516,9 @@ test_programs += \ endif # ----------------------------------------------------------------------------- @@ -31,7 +32,7 @@ index 868873f..533e454 100644 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 +@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif @@ -41,18 +42,18 @@ index 868873f..533e454 100644 +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) -- + test-generated.txt: test1.txt + $(AM_V_GEN) echo "Generated" > $@ && \ +@@ -564,7 +567,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-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource -endif # !CROSS_COMPILING - BUILT_SOURCES += giotypefuncs.c + BUILT_SOURCES += giotypefuncs.inc diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 16f2827..4c2208e 100644 +index 656941d..68555ff 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am @@ -48,10 +48,13 @@ if ENABLE_TIMELOOP @@ -79,3 +80,6 @@ index 16f2827..4c2208e 100644 dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \ +-- +2.14.1 + |