summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-08 09:16:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:11 +0000
commit58c76a210c6b9de462686fa41466a871bc716f00 (patch)
tree0ef09137bc3b7b6db12811178d126e4cc5c806a9
parent244296421a6cb8a45792e0f35d05fa5285290363 (diff)
downloadpoky-58c76a210c6b9de462686fa41466a871bc716f00.tar.gz
popt: disable tests
Use of $(top_srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. (From OE-Core rev: e2c1565a791b9fba2eec8cfb128afa13db0c1ef8) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 @@
1Use of $(top_srcdir) in TESTS is an error which causes
2automake-1.13 to abort. Just remove tests.
3
4Upstream-Status: Inappropriate [disable feature]
5
6Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
7diff -Nurd popt-1.16/Makefile.am popt-1.16/Makefile.am
8--- popt-1.16/Makefile.am 2010-05-04 23:55:54.000000000 +0300
9+++ popt-1.16/Makefile.am 2013-01-02 13:34:29.540361391 +0200
10@@ -34,11 +34,6 @@
11
12 noinst_SCRIPTS = testit.sh
13
14-TESTS_ENVIRONMENT = \
15-test1="$(top_builddir)/test1"
16-
17-TESTS = $(top_srcdir)/testit.sh
18-
19 include_HEADERS = popt.h
20
21 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"
4 4
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" 6LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d"
7PR = "r2" 7PR = "r3"
8 8
9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ 9SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \
10 file://pkgconfig_fix.patch \ 10 file://pkgconfig_fix.patch \
11 file://popt_fix_for_automake-1.12.patch \ 11 file://popt_fix_for_automake-1.12.patch \
12 file://disable_tests.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" 15SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33"