From: Marko Lindqvist <cazfi74@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 07/15] libx11: disable tests
Date: Mon, 7 Jan 2013 01:49:33 +0200 [thread overview]
Message-ID: <1357516181-5358-8-git-send-email-cazfi74@gmail.com> (raw)
In-Reply-To: <1357516181-5358-7-git-send-email-cazfi74@gmail.com>
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>
---
.../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..8f5e531
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/disable_tests.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate
+
+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 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"
--
1.7.10.4
next prev parent reply other threads:[~2013-01-07 0:05 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 23:49 Prepare recipes for automake-1.13 (batch 1 / v2) Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 01/15] pkg-config: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 02/15] libtool: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 03/15] bison: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 04/15] file: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 05/15] popt: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-06 23:49 ` Marko Lindqvist [this message]
2013-01-06 23:49 ` [PATCH v2 08/15] libpng: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 09/15] libusb: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 10/15] pixman: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 11/15] libid3tag: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 12/15] libgcrypt: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 13/15] gnutls: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 14/15] libtasn1: remove help2man dependency Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 15/15] flac: replace obsolete automake macros with working ones Marko Lindqvist
2013-01-07 11:59 ` [PATCH v2 04/15] file: " Richard Purdie
2013-01-07 12:11 ` Marko Lindqvist
2013-01-07 12:16 ` Burton, Ross
2013-01-07 12:18 ` Otavio Salvador
2013-01-07 13:46 ` Richard Purdie
2013-01-07 15:58 ` Otavio Salvador
2013-01-07 16:26 ` Marko Lindqvist
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357516181-5358-8-git-send-email-cazfi74@gmail.com \
--to=cazfi74@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox