diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-12-02 18:54:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-04 12:30:58 +0000 |
commit | 030c2b8df0410a911fabbedd5e617f9a97bb62b6 (patch) | |
tree | 1e6205979519d3f9c80d8937e0bb5f236b8ce027 | |
parent | 6c2d399220dd1e7d6b69e653a066205c60e38ed5 (diff) | |
download | poky-030c2b8df0410a911fabbedd5e617f9a97bb62b6.tar.gz |
sed: upgrade to 4.7
Drop both patches as they are no longer necessary.
Rewrite ptest support as it has been refactored upstream.
Ptest results:
TOTAL: 67
PASS: 59
SKIP: 8 (due to missing valgrind)
(From OE-Core rev: bd40260cbacf660e7390f4f5ef5e096e75774b05)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6 files changed, 66 insertions, 155 deletions
diff --git a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4c..0000000000 --- a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | lib/gnulib.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
19 | index e1d74db..c0e92dd 100644 | ||
20 | --- a/lib/gnulib.mk | ||
21 | +++ b/lib/gnulib.mk | ||
22 | @@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local | ||
23 | case '$(host_os)' in \ | ||
24 | darwin[56]*) \ | ||
25 | need_charset_alias=true ;; \ | ||
26 | - darwin* | cygwin* | mingw* | pw32* | cegcc*) \ | ||
27 | + darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ | ||
28 | need_charset_alias=false ;; \ | ||
29 | *) \ | ||
30 | need_charset_alias=true ;; \ | ||
31 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/meta/recipes-extended/sed/sed-4.2.2/run-ptest deleted file mode 100644 index 7c0f62770e..0000000000 --- a/meta/recipes-extended/sed/sed-4.2.2/run-ptest +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | make -C testsuite -k runtest-TESTS | ||
diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch deleted file mode 100644 index 0293900fbf..0000000000 --- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | sed: add ptest | ||
2 | |||
3 | ptest needs buildtest-TESTS and runtest-TESTS targets. | ||
4 | serial-tests is required to generate those targets. | ||
5 | |||
6 | And fix following error after add serial-tests. | ||
7 | |||
8 | [snip] | ||
9 | help2man: can't get `--help' info from ../sed/sed | ||
10 | make[2]: *** [sed.1] Error 2 | ||
11 | [snip] | ||
12 | |||
13 | Upstream-Status: Inappropriate | ||
14 | |||
15 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
16 | --- | ||
17 | configure.ac | 2 +- | ||
18 | doc/Makefile.am | 2 +- | ||
19 | testsuite/Makefile.am | 6 ++++++ | ||
20 | 3 files changed, 8 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/configure.ac b/configure.ac | ||
23 | index 9d33ec9..4f0c532 100644 | ||
24 | --- a/configure.ac | ||
25 | +++ b/configure.ac | ||
26 | @@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux) | ||
27 | AC_CONFIG_SRCDIR([sed/sed.c]) | ||
28 | AM_CONFIG_HEADER(config.h:config_h.in) | ||
29 | AC_PREREQ(2.60) | ||
30 | -AM_INIT_AUTOMAKE | ||
31 | +AM_INIT_AUTOMAKE([serial-tests]) | ||
32 | |||
33 | SED_FEATURE_VERSION=4.2.2 | ||
34 | AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", | ||
35 | diff --git a/doc/Makefile.am b/doc/Makefile.am | ||
36 | index af6975c..6fd8c9a 100644 | ||
37 | --- a/doc/Makefile.am | ||
38 | +++ b/doc/Makefile.am | ||
39 | @@ -25,7 +25,7 @@ $(srcdir)/s-texi: sed-in.texi $(srcdir)/groupify.sed | ||
40 | fi | ||
41 | echo stamp > $(srcdir)/s-texi | ||
42 | |||
43 | -sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x | ||
44 | +_sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x | ||
45 | $(HELP2MAN) --name "stream editor for filtering and transforming text" \ | ||
46 | -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) | ||
47 | |||
48 | diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am | ||
49 | index d80e72c..b05f01e 100644 | ||
50 | --- a/testsuite/Makefile.am | ||
51 | +++ b/testsuite/Makefile.am | ||
52 | @@ -99,5 +99,11 @@ EXTRA_DIST = \ | ||
53 | # automake makes `check' depend on $(TESTS). Declare | ||
54 | # dummy targets for $(TESTS) so that make does not complain. | ||
55 | |||
56 | +install-ptest: | ||
57 | + cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - ) | ||
58 | + for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done | ||
59 | + sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile | ||
60 | + for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done | ||
61 | + | ||
62 | .PHONY: $(SEDTESTS) | ||
63 | $(SEDTESTS): | ||
64 | -- | ||
65 | 1.7.9.5 | ||
66 | |||
diff --git a/meta/recipes-extended/sed/sed/run-ptest b/meta/recipes-extended/sed/sed/run-ptest new file mode 100644 index 0000000000..993d7d5d75 --- /dev/null +++ b/meta/recipes-extended/sed/sed/run-ptest | |||
@@ -0,0 +1,5 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | chown nobody testsuite | ||
4 | chown nobody ../ptest | ||
5 | su nobody -c "make test-suite.log" | ||
diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb deleted file mode 100644 index 8e436bad80..0000000000 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | SUMMARY = "Stream EDitor (text filtering utility)" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/sed/" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ | ||
5 | file://sed/sed.h;beginline=1;endline=17;md5=767ab3a06d7584f6fd0469abaec4412f" | ||
6 | SECTION = "console/utils" | ||
7 | |||
8 | SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \ | ||
9 | file://sed-add-ptest.patch \ | ||
10 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
11 | file://run-ptest \ | ||
12 | " | ||
13 | |||
14 | SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056" | ||
15 | SRC_URI[sha256sum] = "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff" | ||
16 | |||
17 | inherit autotools texinfo update-alternatives gettext ptest | ||
18 | RDEPENDS_${PN}-ptest += "make" | ||
19 | RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru" | ||
20 | |||
21 | EXTRA_OECONF = "--disable-acl \ | ||
22 | ${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-regex-tests', '', d)}" | ||
23 | |||
24 | do_install () { | ||
25 | autotools_do_install | ||
26 | install -d ${D}${base_bindir} | ||
27 | if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then | ||
28 | mv ${D}${bindir}/sed ${D}${base_bindir}/sed | ||
29 | rmdir ${D}${bindir}/ | ||
30 | fi | ||
31 | } | ||
32 | |||
33 | ALTERNATIVE_${PN} = "sed" | ||
34 | ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" | ||
35 | ALTERNATIVE_PRIORITY = "100" | ||
36 | |||
37 | TESTDIR = "testsuite" | ||
38 | |||
39 | do_compile_ptest() { | ||
40 | oe_runmake -C ${TESTDIR} buildtest-TESTS | ||
41 | } | ||
42 | |||
43 | do_install_ptest() { | ||
44 | oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B} DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR} | ||
45 | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ | ||
46 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | ||
47 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
48 | -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | ||
49 | -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ | ||
50 | -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile | ||
51 | } | ||
52 | |||
53 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" | ||
diff --git a/meta/recipes-extended/sed/sed_4.7.bb b/meta/recipes-extended/sed/sed_4.7.bb new file mode 100644 index 0000000000..312f07f047 --- /dev/null +++ b/meta/recipes-extended/sed/sed_4.7.bb | |||
@@ -0,0 +1,61 @@ | |||
1 | SUMMARY = "Stream EDitor (text filtering utility)" | ||
2 | HOMEPAGE = "http://www.gnu.org/software/sed/" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ | ||
5 | file://sed/sed.h;beginline=1;endline=15;md5=e869c874e5472ba89f63f381b0e93475" | ||
6 | SECTION = "console/utils" | ||
7 | |||
8 | SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.xz \ | ||
9 | file://run-ptest \ | ||
10 | " | ||
11 | |||
12 | SRC_URI[md5sum] = "777ddfd9d71dd06711fe91f0925e1573" | ||
13 | SRC_URI[sha256sum] = "2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a" | ||
14 | |||
15 | inherit autotools texinfo update-alternatives gettext ptest | ||
16 | RDEPENDS_${PN}-ptest += "make gawk perl perl-module-filehandle perl-module-file-compare perl-module-file-find perl-module-file-temp perl-module-file-stat" | ||
17 | RRECOMMENDS_${PN}-ptest_append_libc-glibc = " locale-base-ru-ru locale-base-en-us locale-base-el-gr.iso-8859-7" | ||
18 | |||
19 | EXTRA_OECONF = "--disable-acl \ | ||
20 | " | ||
21 | |||
22 | do_install () { | ||
23 | autotools_do_install | ||
24 | install -d ${D}${base_bindir} | ||
25 | if [ ! ${D}${bindir} -ef ${D}${base_bindir} ]; then | ||
26 | mv ${D}${bindir}/sed ${D}${base_bindir}/sed | ||
27 | rmdir ${D}${bindir}/ | ||
28 | fi | ||
29 | } | ||
30 | |||
31 | ALTERNATIVE_${PN} = "sed" | ||
32 | ALTERNATIVE_LINK_NAME[sed] = "${base_bindir}/sed" | ||
33 | ALTERNATIVE_PRIORITY = "100" | ||
34 | |||
35 | do_compile_ptest() { | ||
36 | oe_runmake testsuite/get-mb-cur-max testsuite/test-mbrtowc | ||
37 | } | ||
38 | |||
39 | do_install_ptest() { | ||
40 | cp -rf ${S}/testsuite/ ${D}${PTEST_PATH} | ||
41 | cp -rf ${B}/testsuite/* ${D}${PTEST_PATH}/testsuite/ | ||
42 | cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}/ | ||
43 | cp ${B}/Makefile ${D}${PTEST_PATH} | ||
44 | cp ${S}/init.cfg ${D}${PTEST_PATH} | ||
45 | |||
46 | sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i ${D}${PTEST_PATH}/Makefile | ||
47 | for i in `grep -rl "sed/sed" ${D}${PTEST_PATH}`; do sed -e 's/..\/sed\/sed/sed/' -i $i; done | ||
48 | |||
49 | sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ | ||
50 | -e 's|${DEBUG_PREFIX_MAP}||g' \ | ||
51 | -e 's:${HOSTTOOLS_DIR}/::g' \ | ||
52 | -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ | ||
53 | -e 's:abs_top_builddir =.*:abs_top_builddir = ..:g' \ | ||
54 | -e 's:abs_top_srcdir =.*:abs_top_srcdir = ..:g' \ | ||
55 | -e 's:abs_srcdir =.*:abs_srcdir = ..:g' \ | ||
56 | -e 's:top_srcdir =.*:top_srcdir = ..:g' \ | ||
57 | -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ | ||
58 | -i ${D}${PTEST_PATH}/Makefile | ||
59 | } | ||
60 | |||
61 | RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sed', '', d)}" | ||