From: Marko Lindqvist <cazfi74@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 05/15] popt: disable tests
Date: Mon, 7 Jan 2013 01:49:31 +0200 [thread overview]
Message-ID: <1357516181-5358-6-git-send-email-cazfi74@gmail.com> (raw)
In-Reply-To: <1357516181-5358-5-git-send-email-cazfi74@gmail.com>
Use of $(top_srcdir) in TESTS is an error causing automake-1.13
to abort. Disable the tests completely.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
meta/recipes-support/popt/popt/disable_tests.patch | 21 ++++++++++++++++++++
meta/recipes-support/popt/popt_1.16.bb | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-support/popt/popt/disable_tests.patch
diff --git a/meta/recipes-support/popt/popt/disable_tests.patch b/meta/recipes-support/popt/popt/disable_tests.patch
new file mode 100644
index 0000000..dedd061
--- /dev/null
+++ b/meta/recipes-support/popt/popt/disable_tests.patch
@@ -0,0 +1,21 @@
+Use of $(top_srcdir) in TESTS is an error which causes
+automake-1.13 to abort. Just remove tests.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am
+--- popt-1.16/Makefile.am 2010-05-04 23:55:54.000000000 +0300
++++ popt-1.16/Makefile.am 2013-01-02 13:34:29.540361391 +0200
+@@ -34,11 +34,6 @@
+
+ noinst_SCRIPTS = testit.sh
+
+-TESTS_ENVIRONMENT = \
+-test1="$(top_builddir)/test1"
+-
+-TESTS = $(top_srcdir)/testit.sh
+-
+ include_HEADERS = popt.h
+
+ usrlibdir = $(libdir)
diff --git a/meta/recipes-support/popt/popt_1.16.bb b/meta/recipes-support/popt/popt_1.16.bb
index 91b0d60..aa4e379 100644
--- a/meta/recipes-support/popt/popt_1.16.bb
+++ b/meta/recipes-support/popt/popt_1.16.bb
@@ -4,11 +4,12 @@ SECTION = "libs"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
file://pkgconfig_fix.patch \
file://popt_fix_for_automake-1.12.patch \
+ file://disable_tests.patch \
"
SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"
--
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 ` Marko Lindqvist [this message]
2013-01-06 23:49 ` [PATCH v2 06/15] glib-2.0: " Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 07/15] libx11: disable tests Marko Lindqvist
2013-01-06 23:49 ` [PATCH v2 08/15] libpng: replace obsolete automake macros with working ones 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-6-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