From patchwork Tue Jan 8 07:16:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,05/12] libx11: disable tests Date: Tue, 08 Jan 2013 07:16:37 -0000 From: Marko Lindqvist X-Patchwork-Id: 42265 Message-Id: <1357629404-22020-6-git-send-email-cazfi74@gmail.com> To: openembedded-core@lists.openembedded.org Use of $(srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. Signed-off-by: Marko Lindqvist --- .../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 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"