From 72830226190b828854e3d27720711f9c147bfe28 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 15 Apr 2015 19:00:25 -0700 Subject: recipes: Fix charset.alias for musl This is same gnulib fix replicated across needed recipes Change-Id: I756713407111a726eae98e26c9c1ff64981371c0 (From OE-Core rev: fbe6d2c12aa9f7956bc87efeb68cb64b26b60c7a) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...need_charset_alias-when-building-for-musl.patch | 30 ++++++++++++++++++++++ .../recipes-extended/findutils/findutils_4.5.14.bb | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch (limited to 'meta/recipes-extended/findutils') diff --git a/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..85d243baf3 --- /dev/null +++ b/meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,30 @@ +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: Not Required + +Signed-off-by: Khem Raj +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: findutils-4.5.14/gl/lib/Makefile.am +=================================================================== +--- findutils-4.5.14.orig/gl/lib/Makefile.am ++++ findutils-4.5.14/gl/lib/Makefile.am +@@ -1220,7 +1220,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 ;; \ diff --git a/meta/recipes-extended/findutils/findutils_4.5.14.bb b/meta/recipes-extended/findutils/findutils_4.5.14.bb index 9253637fc1..a58a82f0e5 100644 --- a/meta/recipes-extended/findutils/findutils_4.5.14.bb +++ b/meta/recipes-extended/findutils/findutils_4.5.14.bb @@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" DEPENDS = "bison-native" +SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch" + SRC_URI[md5sum] = "a8a8176282fd28e8d1234c84d847fa66" SRC_URI[sha256sum] = "0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2" -- cgit v1.2.3-54-g00ecf