[oe-commits] Marko Lindqvist : popt: disable tests
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 10 23:52:30 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: e2c1565a791b9fba2eec8cfb128afa13db0c1ef8
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e2c1565a791b9fba2eec8cfb128afa13db0c1ef8
Author: Marko Lindqvist <cazfi74 at gmail.com>
Date: Tue Jan 8 09:16:35 2013 +0200
popt: disable tests
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 at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.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 deletions(-)
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..016cf66
--- /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 [disable feature]
+
+Signed-off-by: Marko Lindqvist <cazfi74 at 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"
More information about the Openembedded-commits
mailing list