summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libunistring/libunistring
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libunistring/libunistring')
-rw-r--r--meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch30
-rw-r--r--meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch56
2 files changed, 0 insertions, 86 deletions
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
deleted file mode 100644
index 2aeacb868e..0000000000
--- a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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: Pending
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: libunistring-0.9.4/lib/Makefile.gnulib
19===================================================================
20--- libunistring-0.9.4.orig/lib/Makefile.gnulib
21+++ libunistring-0.9.4/lib/Makefile.gnulib
22@@ -380,7 +380,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-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
deleted file mode 100644
index 9e8ce2270d..0000000000
--- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Tue, 5 Dec 2017 09:30:36 +0200
4Subject: [PATCH] remove the test to convert euc-jp
5
6Remove the test "Test against HP-UX 11.11 bug:
7No converter from EUC-JP to UTF-8 is provided"
8since we don't support HP-UX and if the euc-jp is not
9installed on the host, libunistring will be built without
10iconv support and will cause guild-native configure fail.
11
12Upstream-Status: Inappropriate [OE specific]
13
14Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
15---
16---
17 gnulib-m4/iconv.m4 | 23 -----------------------
18 1 file changed, 23 deletions(-)
19
20diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
21index b33ecd0..73b6aa1 100644
22--- a/gnulib-m4/iconv.m4
23+++ b/gnulib-m4/iconv.m4
24@@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK],
25 }
26 }
27 #endif
28- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
29- provided. */
30- {
31- /* Try standardized names. */
32- iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
33- /* Try IRIX, OSF/1 names. */
34- iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
35- /* Try AIX names. */
36- iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
37- /* Try HP-UX names. */
38- iconv_t cd4 = iconv_open ("utf8", "eucJP");
39- if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
40- && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
41- result |= 16;
42- if (cd1 != (iconv_t)(-1))
43- iconv_close (cd1);
44- if (cd2 != (iconv_t)(-1))
45- iconv_close (cd2);
46- if (cd3 != (iconv_t)(-1))
47- iconv_close (cd3);
48- if (cd4 != (iconv_t)(-1))
49- iconv_close (cd4);
50- }
51 return result;
52 ]])],
53 [am_cv_func_iconv_works=yes], ,
54--
552.4.0
56