From 34a4408d3dece0f5da8acf4b321f7aa2dbee6e12 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 8 Jan 2013 09:16:37 +0200 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../xorg-lib/libx11/disable_tests.patch | 17 +++++++++++++++++ meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch (limited to 'meta/recipes-graphics/xorg-lib') 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 0000000..c570e45 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist +diff -Nurd libX11-1.5.0/nls/Makefile.am libX11-1.5.0/nls/Makefile.am +--- libX11-1.5.0/nls/Makefile.am 2012-06-02 09:37:18.000000000 +0300 ++++ libX11-1.5.0/nls/Makefile.am 2013-01-02 16:10:24.960156131 +0200 +@@ -36,11 +36,6 @@ + < locale.dir.l1 > locale.dir.l2 + cat locale.dir.l2 locale.dir.l1 > locale.dir + +-if HAVE_PERL +-TESTS_ENVIRONMENT = $(PERL) +-TESTS = $(srcdir)/compose-check.pl +-endif HAVE_PERL +- + + # 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 94e2051..7f18824 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 @@ require libx11.inc inherit gettext -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" BBCLASSEXTEND = "native nativesdk" -SRC_URI += "file://keysymdef_include.patch" +SRC_URI += "file://keysymdef_include.patch \ + file://disable_tests.patch \ + " SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -- cgit v1.1