summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:11 +0000
commit34a4408d3dece0f5da8acf4b321f7aa2dbee6e12 (patch)
treedbab863f3a82c131c1fc184db23b7c8de190f22c /meta/recipes-graphics/xorg-lib
parent8e1ca4b9569b8341fc1494c51e1ba8060867bc26 (diff)
downloadpoky-34a4408d3dece0f5da8acf4b321f7aa2dbee6e12.tar.gz
libx11: disable tests
Use of $(srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. (From OE-Core rev: b814732da2cbf927b1bf49aee5e3d50f16a3a34c) 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-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch17
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb6
2 files changed, 21 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
new file mode 100644
index 0000000000..c570e45991
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
@@ -0,0 +1,17 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am
5--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300
6+++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200
7@@ -36,11 +36,6 @@
8 < locale.dir.l1 > locale.dir.l2
9 cat locale.dir.l2 locale.dir.l1 > locale.dir
10
11-if HAVE_PERL
12-TESTS_ENVIRONMENT = $(PERL)
13-TESTS = $(srcdir)/compose-check.pl
14-endif HAVE_PERL
15-
16
17 # Per-locale data files
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
index 94e205105f..7f18824850 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,11 +1,13 @@
1require libx11.inc 1require libx11.inc
2inherit gettext 2inherit gettext
3 3
4PR = "${INC_PR}.2" 4PR = "${INC_PR}.3"
5 5
6BBCLASSEXTEND = "native nativesdk" 6BBCLASSEXTEND = "native nativesdk"
7 7
8SRC_URI += "file://keysymdef_include.patch" 8SRC_URI += "file://keysymdef_include.patch \
9 file://disable_tests.patch \
10 "
9 11
10SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" 12SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
11SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" 13SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"