diff options
| author |   Marko Lindqvist <cazfi74@gmail.com> | 2013-01-08 09:16:37 +0200 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2013-01-09 16:40:37 -0800 |
| commit | b814732da2cbf927b1bf49aee5e3d50f16a3a34c (patch) | |
| tree | a478dd63708179ce601baca3b356a4b901308d3f /meta | |
| parent | fd05a7137082517947ba5af32d2b80a9beaa4ad7 (diff) | |
| download | openembedded-core-contrib-b814732da2cbf927b1bf49aee5e3d50f16a3a34c.tar.gz | |
libx11: disable tests
Use of $(srcdir) in TESTS is an error causing automake-1.13
to abort. Disable the tests completely.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch | 17 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 6 |
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 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +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 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 @@ 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" |