summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-08-23 00:37:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:47:18 +0100
commit04fd06882fc25fda605f9d7e4dc5074f225362ed (patch)
tree48efa53e778422282ff0b97eda0e00a6480230f5 /meta/recipes-gnome
parent2526a172bde60b2fa55e2d23a5169e44a5661e8d (diff)
downloadpoky-04fd06882fc25fda605f9d7e4dc5074f225362ed.tar.gz
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>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch37
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb3
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 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac
5--- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300
6+++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300
7@@ -166,6 +166,9 @@
8
9 AC_SUBST(DEVELOPMENT_CFLAGS)
10
11+AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]])
12+AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]])
13+
14 AM_CONFIG_HEADER([engines/support/config.h])
15
16 AC_CONFIG_FILES([
17diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am
18--- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300
19+++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300
20@@ -66,7 +66,7 @@
21 # Prefix with exported_
22 EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
23
24-TESTS += $(EXPORTED_SYMBOLS_TESTS)
25+TESTS += @exported_symbols_tests@
26
27
28 #############################################################
29@@ -88,7 +88,7 @@
30 TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
31
32 # Add TORTURE_TEST_ENGINES to list of tests
33-TESTS += $(TORTURE_TEST_TESTS)
34+TESTS += @torture_test_tests@
35
36 # Possible other tests:
37 # - 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() {
37 # TODO: mark theme packages as arch all 37 # TODO: mark theme packages as arch all
38} 38}
39 39
40SRC_URI += "file://glib-2.32.patch" 40SRC_URI += "file://glib-2.32.patch \
41 file://substitute-tests.patch"
41SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" 42SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f"
42SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" 43SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"