diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-04-15 19:00:25 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-21 07:20:25 +0100 |
commit | 72830226190b828854e3d27720711f9c147bfe28 (patch) | |
tree | 9e6fa2d20742e55636b4edf92d0e08fee9265f3a /meta/recipes-extended/diffutils | |
parent | bd1aa288df093c906acc601356a03c8b19e9641f (diff) | |
download | poky-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/diffutils')
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
-rw-r--r-- | meta/recipes-extended/diffutils/diffutils_3.3.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..abdfa2a50b --- /dev/null +++ b/meta/recipes-extended/diffutils/diffutils-3.3/0001-Unset-need_charset_alias-when-building-for-musl.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Not Required | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | lib/gnulib.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
19 | index 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 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-extended/diffutils/diffutils_3.3.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb index b708962447..5008690ea4 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.3.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb | |||
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
4 | require diffutils.inc | 4 | require diffutils.inc |
5 | 5 | ||
6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ | 6 | SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \ |
7 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
7 | file://run-ptest \ | 8 | file://run-ptest \ |
8 | " | 9 | " |
9 | 10 | ||