From a718c845b5274858eff297eacf5a3a02cd5c0ae8 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Fri, 2 Dec 2016 03:03:57 -0800 Subject: diffutils: 3.4 -> 3.5 Upgrade diffutils from 3.4 to 3.5. Signed-off-by: Huang Qiyu Signed-off-by: Ross Burton --- ...need_charset_alias-when-building-for-musl.patch | 33 ------------------- .../diffutils/diffutils-3.4/run-ptest | 3 -- ...need_charset_alias-when-building-for-musl.patch | 33 +++++++++++++++++++ .../diffutils/diffutils-3.5/run-ptest | 3 ++ meta/recipes-extended/diffutils/diffutils_3.4.bb | 37 ---------------------- meta/recipes-extended/diffutils/diffutils_3.5.bb | 37 ++++++++++++++++++++++ 6 files changed, 73 insertions(+), 73 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.4/run-ptest create mode 100644 meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch create mode 100644 meta/recipes-extended/diffutils/diffutils-3.5/run-ptest delete mode 100644 meta/recipes-extended/diffutils/diffutils_3.4.bb create mode 100644 meta/recipes-extended/diffutils/diffutils_3.5.bb diff --git a/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4c..0000000000 --- a/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 17:02:13 -0700 -Subject: [PATCH] Unset need_charset_alias when building for musl - -localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 -which actually shoudl be fixed in gnulib and then all downstream -projects will get it eventually. For now we apply the fix to -coreutils - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - lib/gnulib.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/gnulib.mk b/lib/gnulib.mk -index e1d74db..c0e92dd 100644 ---- a/lib/gnulib.mk -+++ b/lib/gnulib.mk -@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local - case '$(host_os)' in \ - darwin[56]*) \ - need_charset_alias=true ;; \ -- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ -+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ - need_charset_alias=false ;; \ - *) \ - need_charset_alias=true ;; \ --- -2.1.4 - diff --git a/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest b/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest deleted file mode 100644 index 695c5e8a7b..0000000000 --- a/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -make -C tests check-TESTS diff --git a/meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..ba1a4bab4c --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,33 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index e1d74db..c0e92dd 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +-- +2.1.4 + diff --git a/meta/recipes-extended/diffutils/diffutils-3.5/run-ptest b/meta/recipes-extended/diffutils/diffutils-3.5/run-ptest new file mode 100644 index 0000000000..695c5e8a7b --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.5/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +make -C tests check-TESTS diff --git a/meta/recipes-extended/diffutils/diffutils_3.4.bb b/meta/recipes-extended/diffutils/diffutils_3.4.bb deleted file mode 100644 index cb7092b514..0000000000 --- a/meta/recipes-extended/diffutils/diffutils_3.4.bb +++ /dev/null @@ -1,37 +0,0 @@ -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -require diffutils.inc - -SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - file://run-ptest \ -" - -EXTRA_OECONF += "--without-libsigsegv-prefix" - -do_configure_prepend () { - # Need to remove gettext macros with weird mix of versions - for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do - rm -f ${S}/m4/$i - done -} - -SRC_URI[md5sum] = "df9ca465f30307cffd03da176a43a5d4" -SRC_URI[sha256sum] = "db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2" - -inherit ptest - -do_install_ptest() { - t=${D}${PTEST_PATH} - install -D ${S}/build-aux/test-driver $t/build-aux/test-driver - cp -r ${S}/tests $t/ - install ${B}/tests/Makefile $t/tests/ - sed -e 's|^Makefile:|_Makefile:|' \ - -e 's|bash|sh|' \ - -e 's|^top_srcdir = \(.*\)|top_srcdir = ..\/|' \ - -e 's|^srcdir = \(.*\)|srcdir = .|' \ - -e 's|"`$(built_programs)`"|diff|' \ - -e 's|gawk|awk|g' \ - -i $t/tests/Makefile -} diff --git a/meta/recipes-extended/diffutils/diffutils_3.5.bb b/meta/recipes-extended/diffutils/diffutils_3.5.bb new file mode 100644 index 0000000000..673f5d46ca --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils_3.5.bb @@ -0,0 +1,37 @@ +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +require diffutils.inc + +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://run-ptest \ +" + +EXTRA_OECONF += "--without-libsigsegv-prefix" + +do_configure_prepend () { + # Need to remove gettext macros with weird mix of versions + for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do + rm -f ${S}/m4/$i + done +} + +SRC_URI[md5sum] = "569354697ff1cfc9a9de3781361015fa" +SRC_URI[sha256sum] = "dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533" + +inherit ptest + +do_install_ptest() { + t=${D}${PTEST_PATH} + install -D ${S}/build-aux/test-driver $t/build-aux/test-driver + cp -r ${S}/tests $t/ + install ${B}/tests/Makefile $t/tests/ + sed -e 's|^Makefile:|_Makefile:|' \ + -e 's|bash|sh|' \ + -e 's|^top_srcdir = \(.*\)|top_srcdir = ..\/|' \ + -e 's|^srcdir = \(.*\)|srcdir = .|' \ + -e 's|"`$(built_programs)`"|diff|' \ + -e 's|gawk|awk|g' \ + -i $t/tests/Makefile +} -- cgit 1.2.3-korg