diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2013-08-23 00:37:28 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:42:10 +0100 |
| commit | ace40e1dfcaca2aa1eae2daf29c812291063fbff (patch) | |
| tree | ccb56df0e87090b925d80f6f9984bfb5c6ec52e4 /meta | |
| parent | b51bfbc304eba448b9913d36444d70a643564c64 (diff) | |
| download | openembedded-core-ace40e1dfcaca2aa1eae2daf29c812291063fbff.tar.gz openembedded-core-ace40e1dfcaca2aa1eae2daf29c812291063fbff.tar.bz2 openembedded-core-ace40e1dfcaca2aa1eae2daf29c812291063fbff.zip | |
gtk-engines: fix build with automake-1.13
Add patch substitute-tests.patch that works around automake
TESTS limitation.
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13771.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch new file mode 100644 index 0000000000..5c557ba689 --- /dev/null +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch @@ -0,0 +1,37 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac +--- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 ++++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 +@@ -166,6 +166,9 @@ + + AC_SUBST(DEVELOPMENT_CFLAGS) + ++AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) ++AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) ++ + AM_CONFIG_HEADER([engines/support/config.h]) + + AC_CONFIG_FILES([ +diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am +--- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 ++++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 +@@ -66,7 +66,7 @@ + # Prefix with exported_ + EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) + +-TESTS += $(EXPORTED_SYMBOLS_TESTS) ++TESTS += @exported_symbols_tests@ + + + ############################################################# +@@ -88,7 +88,7 @@ + TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) + + # Add TORTURE_TEST_ENGINES to list of tests +-TESTS += $(TORTURE_TEST_TESTS) ++TESTS += @torture_test_tests@ + + # Possible other tests: + # - An extensive theme switch tests that loads/unloads the engine diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 32d7be45a5..f899307745 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -37,6 +37,7 @@ python populate_packages_prepend() { # TODO: mark theme packages as arch all } -SRC_URI += "file://glib-2.32.patch" +SRC_URI += "file://glib-2.32.patch \ + file://substitute-tests.patch" SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" |