summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/findutils
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-15 19:00:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:25 +0100
commit72830226190b828854e3d27720711f9c147bfe28 (patch)
tree9e6fa2d20742e55636b4edf92d0e08fee9265f3a /meta/recipes-extended/findutils
parentbd1aa288df093c906acc601356a03c8b19e9641f (diff)
downloadpoky-72830226190b828854e3d27720711f9c147bfe28.tar.gz
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 <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/findutils')
-rw-r--r--meta/recipes-extended/findutils/findutils/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-rw-r--r--meta/recipes-extended/findutils/findutils_4.5.14.bb2
2 files changed, 32 insertions, 0 deletions
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 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Not Required
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: findutils-4.5.14/gl/lib/Makefile.am
19===================================================================
20--- findutils-4.5.14.orig/gl/lib/Makefile.am
21+++ findutils-4.5.14/gl/lib/Makefile.am
22@@ -1220,7 +1220,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 ;; \
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"
6 6
7DEPENDS = "bison-native" 7DEPENDS = "bison-native"
8 8
9SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch"
10
9SRC_URI[md5sum] = "a8a8176282fd28e8d1234c84d847fa66" 11SRC_URI[md5sum] = "a8a8176282fd28e8d1234c84d847fa66"
10SRC_URI[sha256sum] = "0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2" 12SRC_URI[sha256sum] = "0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2"
11 13