aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/popt
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:35 +0200
committerSaul Wold <sgw@linux.intel.com>2013-01-09 16:40:36 -0800
commite2c1565a791b9fba2eec8cfb128afa13db0c1ef8 (patch)
tree48cd3e1c8aecc5fad564c4b421984f19050c98ba /meta/recipes-support/popt
parentc36b032c406f50b8edea961785edca332dc6f843 (diff)
downloadopenembedded-core-e2c1565a791b9fba2eec8cfb128afa13db0c1ef8.tar.gz
openembedded-core-e2c1565a791b9fba2eec8cfb128afa13db0c1ef8.tar.bz2
openembedded-core-e2c1565a791b9fba2eec8cfb128afa13db0c1ef8.zip
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@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/popt')
-rw-r--r--meta/recipes-support/popt/popt/disable_tests.patch21
-rw-r--r--meta/recipes-support/popt/popt_1.16.bb3
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 0000000000..016cf66a27
--- /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@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 91b0d60857..aa4e379c9a 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"