diff options
Diffstat (limited to 'external/poky/meta/recipes-extended/grep')
| -rw-r--r-- | external/poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
| -rw-r--r-- | external/poky/meta/recipes-extended/grep/grep_3.4.bb (renamed from external/poky/meta/recipes-extended/grep/grep_3.1.bb) | 13 |
2 files changed, 5 insertions, 41 deletions
diff --git a/external/poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch b/external/poky/meta/recipes-extended/grep/grep/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab..00000000 --- a/external/poky/meta/recipes-extended/grep/grep/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 <raj.khem@gmail.com> -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 <raj.khem@gmail.com> ---- - 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/external/poky/meta/recipes-extended/grep/grep_3.1.bb b/external/poky/meta/recipes-extended/grep/grep_3.4.bb index 71810dc6..e176dd72 100644 --- a/external/poky/meta/recipes-extended/grep/grep_3.1.bb +++ b/external/poky/meta/recipes-extended/grep/grep_3.4.bb @@ -3,14 +3,12 @@ HOMEPAGE = "http://savannah.gnu.org/projects/grep/" BUGTRACKER = "http://savannah.gnu.org/bugs/?group=grep" SECTION = "console/utils" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=8006d9c814277c1bfc4ca22af94b59ee" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ - file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ - " +SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[md5sum] = "feca7b3e7c7f4aab2b42ecbfc513b070" -SRC_URI[sha256sum] = "db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e" +SRC_URI[md5sum] = "111b117d22d6a7d049d6ae7505e9c4d2" +SRC_URI[sha256sum] = "58e6751c41a7c25bfc6e9363a41786cff3ba5709cf11d5ad903cf7cce31cc3fb" inherit autotools gettext texinfo pkgconfig @@ -18,6 +16,7 @@ inherit autotools gettext texinfo pkgconfig acpaths = "-I ./m4" do_configure_prepend () { + sed -i -e '1s,#!@SHELL@,#!/bin/sh,' ${S}/src/egrep.sh rm -f ${S}/m4/init.m4 } @@ -43,5 +42,3 @@ ALTERNATIVE_${PN} = "grep egrep fgrep" ALTERNATIVE_LINK_NAME[grep] = "${base_bindir}/grep" ALTERNATIVE_LINK_NAME[egrep] = "${base_bindir}/egrep" ALTERNATIVE_LINK_NAME[fgrep] = "${base_bindir}/fgrep" - -export CONFIG_SHELL="/bin/sh" |