diff options
Diffstat (limited to 'meta/recipes-extended/diffutils')
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils.inc | 2 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch | 24 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils_3.10.bb (renamed from meta/recipes-extended/diffutils/diffutils_3.7.bb) | 13 |
3 files changed, 18 insertions, 21 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c9e3130587..194d6e5a1b 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc | |||
@@ -7,7 +7,7 @@ SECTION = "base" | |||
7 | 7 | ||
8 | inherit autotools texinfo update-alternatives gettext | 8 | inherit autotools texinfo update-alternatives gettext |
9 | 9 | ||
10 | ALTERNATIVE_${PN} = "diff cmp" | 10 | ALTERNATIVE:${PN} = "diff cmp" |
11 | ALTERNATIVE_PRIORITY = "100" | 11 | ALTERNATIVE_PRIORITY = "100" |
12 | 12 | ||
13 | BBCLASSEXTEND = "native nativesdk" | 13 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch index aac1c43465..32793233f9 100644 --- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch +++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001 | 1 | From f31395c931bc633206eccfcfaaaa5d15021a3e86 Mon Sep 17 00:00:00 2001 |
2 | From: Peiran Hong <peiran.hong@windriver.com> | 2 | From: Peiran Hong <peiran.hong@windriver.com> |
3 | Date: Thu, 5 Sep 2019 15:42:22 -0400 | 3 | Date: Thu, 5 Sep 2019 15:42:22 -0400 |
4 | Subject: [PATCH] Skip strip-trailing-cr test case | 4 | Subject: [PATCH] Skip strip-trailing-cr test case |
@@ -10,26 +10,20 @@ package. | |||
10 | Upstream-Status: Inappropriate [embedded specific] | 10 | Upstream-Status: Inappropriate [embedded specific] |
11 | 11 | ||
12 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> | 12 | Signed-off-by: Peiran Hong <peiran.hong@windriver.com> |
13 | |||
13 | --- | 14 | --- |
14 | tests/Makefile.am | 4 +++- | 15 | tests/Makefile.am | 1 - |
15 | 1 file changed, 3 insertions(+), 1 deletion(-) | 16 | 1 file changed, 1 deletion(-) |
16 | 17 | ||
17 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 18 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
18 | index 83a7c9d..04d51b5 100644 | 19 | index 79bacfb..4adb4d7 100644 |
19 | --- a/tests/Makefile.am | 20 | --- a/tests/Makefile.am |
20 | +++ b/tests/Makefile.am | 21 | +++ b/tests/Makefile.am |
21 | @@ -21,8 +21,10 @@ TESTS = \ | 22 | @@ -22,7 +22,6 @@ TESTS = \ |
22 | stdin \ | 23 | stdin \ |
23 | strcoll-0-names \ | 24 | strcoll-0-names \ |
24 | filename-quoting \ | 25 | filename-quoting \ |
25 | - strip-trailing-cr \ | 26 | - strip-trailing-cr \ |
26 | colors | 27 | timezone \ |
27 | +# Skipping this test since it requires valgrind | 28 | colors \ |
28 | +# and thus is too heavy for diffutils package | 29 | y2038-vs-32bit |
29 | +# strip-trailing-cr | ||
30 | |||
31 | XFAIL_TESTS = large-subopt | ||
32 | |||
33 | -- | ||
34 | 2.21.0 | ||
35 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils_3.7.bb b/meta/recipes-extended/diffutils/diffutils_3.10.bb index 8111ae6065..08e8305612 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.7.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.10.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | LICENSE = "GPLv3+" | 1 | LICENSE = "GPL-3.0-or-later" |
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
3 | 3 | ||
4 | require diffutils.inc | 4 | require diffutils.inc |
@@ -6,19 +6,22 @@ require diffutils.inc | |||
6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ | 6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ |
7 | file://run-ptest \ | 7 | file://run-ptest \ |
8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ | 8 | file://0001-Skip-strip-trailing-cr-test-case.patch \ |
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI[md5sum] = "4824adc0e95dbbf11dfbdfaad6a1e461" | 11 | SRC_URI[sha256sum] = "90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" |
12 | SRC_URI[sha256sum] = "b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" | ||
13 | 12 | ||
14 | EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" | 13 | EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix" |
15 | 14 | ||
15 | # latest gnulib is no longer able to handle this - I dare not try to fix that maze of abstractions and generators | ||
16 | CFLAGS:mingw32 = " -DSA_RESTART=0" | ||
17 | |||
16 | # Fix "Argument list too long" error when len(TMPDIR) = 410 | 18 | # Fix "Argument list too long" error when len(TMPDIR) = 410 |
17 | acpaths = "-I ./m4" | 19 | acpaths = "-I ./m4" |
18 | 20 | ||
21 | EXTRA_OEMAKE:append:mingw32 = " LIBS='-lbcrypt'" | ||
19 | inherit ptest | 22 | inherit ptest |
20 | 23 | ||
21 | RDEPENDS_${PN}-ptest += "make perl" | 24 | RDEPENDS:${PN}-ptest += "make perl" |
22 | 25 | ||
23 | do_install_ptest() { | 26 | do_install_ptest() { |
24 | t=${D}${PTEST_PATH} | 27 | t=${D}${PTEST_PATH} |