diff options
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/popt/popt/disable_tests.patch | 21 | ||||
-rw-r--r-- | 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 0000000000..016cf66a27 --- /dev/null +++ b/meta/recipes-support/popt/popt/disable_tests.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | Use of $(top_srcdir) in TESTS is an error which causes | ||
2 | automake-1.13 to abort. Just remove tests. | ||
3 | |||
4 | Upstream-Status: Inappropriate [disable feature] | ||
5 | |||
6 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
7 | diff -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 | ||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=cb0613c30af2a8249b8dcc67d3edb06d" |
7 | PR = "r2" | 7 | PR = "r3" |
8 | 8 | ||
9 | SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz \ | 9 | SRC_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 | ||
14 | SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" | 15 | SRC_URI[md5sum] = "3743beefa3dd6247a73f8f7a32c14c33" |