summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-15 19:00:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-21 07:20:24 +0100
commit95f253451469f20338fbe4219922992516e9e34f (patch)
treead614bbdedb2745b8d5d0398fadc7a3936f9448c
parent3dcaab5893470b42f60dbaae4e40c4d2e1e924b0 (diff)
downloadpoky-95f253451469f20338fbe4219922992516e9e34f.tar.gz
coreutils: Add code to consider musl when selecting charsets
The real issue is in gnulib where it should be fixed but gnulib gets imported in source into various components and that may take a while. So lets fix the componnets versions and as/if they land in new gnulib with a fix we can take it off. Change-Id: I63bbcb7bc4d92cb1ec74bb4f4f5109a377060253 (From OE-Core rev: 901114ffb72c14b989690d753298d9db77a126b5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch33
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.23.bb1
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch
new file mode 100644
index 0000000000..abdfa2a50b
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-8.23/0001-Unset-need_charset_alias-when-building-for-musl.patch
@@ -0,0 +1,33 @@
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
18diff --git a/lib/gnulib.mk b/lib/gnulib.mk
19index 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--
322.1.4
33
diff --git a/meta/recipes-core/coreutils/coreutils_8.23.bb b/meta/recipes-core/coreutils/coreutils_8.23.bb
index 63df75e7ba..70c04a5f11 100644
--- a/meta/recipes-core/coreutils/coreutils_8.23.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.23.bb
@@ -17,6 +17,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \
17 file://man-decouple-manpages-from-build.patch \ 17 file://man-decouple-manpages-from-build.patch \
18 file://remove-usr-local-lib-from-m4.patch \ 18 file://remove-usr-local-lib-from-m4.patch \
19 file://fix-selinux-flask.patch \ 19 file://fix-selinux-flask.patch \
20 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
20 " 21 "
21 22
22SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41" 23SRC_URI[tarball.md5sum] = "abed135279f87ad6762ce57ff6d89c41"