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/wget | |
| 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/wget')
| -rw-r--r-- | meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/wget/wget_1.16.3.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..c1cbd145b3 --- /dev/null +++ b/meta/recipes-extended/wget/wget/0001-Unset-need_charset_alias-when-building-for-musl.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 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 | Index: wget-1.16.3/lib/Makefile.am | ||
| 19 | =================================================================== | ||
| 20 | --- wget-1.16.3.orig/lib/Makefile.am | ||
| 21 | +++ wget-1.16.3/lib/Makefile.am | ||
| 22 | @@ -846,7 +846,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/wget/wget_1.16.3.bb b/meta/recipes-extended/wget/wget_1.16.3.bb index 87755b2934..5c34a42dfe 100644 --- a/meta/recipes-extended/wget/wget_1.16.3.bb +++ b/meta/recipes-extended/wget/wget_1.16.3.bb | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ | 1 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ |
| 2 | file://fix_makefile.patch \ | 2 | file://fix_makefile.patch \ |
| 3 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
| 3 | " | 4 | " |
| 4 | 5 | ||
| 5 | SRC_URI[md5sum] = "f61d9011b99f824106a5d5a05dd0f63d" | 6 | SRC_URI[md5sum] = "f61d9011b99f824106a5d5a05dd0f63d" |
