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.

(From OE-Core rev: ace40e1dfcaca2aa1eae2daf29c812291063fbff)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist 2013-08-23 00:37:28 +03:00 committed by Richard Purdie
parent 2526a172bd
commit 04fd06882f
2 changed files with 39 additions and 1 deletions

View File

@ -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

View File

@ -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"