From fbe6d2c12aa9f7956bc87efeb68cb64b26b60c7a 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...need_charset_alias-when-building-for-musl.patch | 30 ++++++++++++++++++++++ .../libunistring/libunistring_0.9.4.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch (limited to 'meta/recipes-support/libunistring') diff --git a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..a62194b6f1 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/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: libunistring-0.9.4/lib/Makefile.gnulib +=================================================================== +--- libunistring-0.9.4.orig/lib/Makefile.gnulib ++++ libunistring-0.9.4/lib/Makefile.gnulib +@@ -380,7 +380,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-support/libunistring/libunistring_0.9.4.bb b/meta/recipes-support/libunistring/libunistring_0.9.4.bb index 89b1dc26f1..289c813a07 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.4.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.4.bb @@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " SRC_URI[md5sum] = "c24a6a3838d9ad4a41a62549312c4226" -- cgit 1.2.3-korg