diff options
Diffstat (limited to 'meta/recipes-support/libunistring')
-rw-r--r-- | meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch | 30 | ||||
-rw-r--r-- | meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch | 56 | ||||
-rw-r--r-- | meta/recipes-support/libunistring/libunistring_1.2.bb (renamed from meta/recipes-support/libunistring/libunistring_0.9.10.bb) | 17 |
3 files changed, 7 insertions, 96 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 @@ | |||
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: Pending | ||
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: 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 @@ | |||
1 | From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Tue, 5 Dec 2017 09:30:36 +0200 | ||
4 | Subject: [PATCH] remove the test to convert euc-jp | ||
5 | |||
6 | Remove the test "Test against HP-UX 11.11 bug: | ||
7 | No converter from EUC-JP to UTF-8 is provided" | ||
8 | since we don't support HP-UX and if the euc-jp is not | ||
9 | installed on the host, libunistring will be built without | ||
10 | iconv support and will cause guild-native configure fail. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
15 | --- | ||
16 | --- | ||
17 | gnulib-m4/iconv.m4 | 23 ----------------------- | ||
18 | 1 file changed, 23 deletions(-) | ||
19 | |||
20 | diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 | ||
21 | index 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 | -- | ||
55 | 2.4.0 | ||
56 | |||
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_1.2.bb index 97fac4ecfa..3018dbfdfb 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb +++ b/meta/recipes-support/libunistring/libunistring_1.2.bb | |||
@@ -13,18 +13,15 @@ DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\ | |||
13 | 13 | ||
14 | HOMEPAGE = "http://www.gnu.org/software/libunistring/" | 14 | HOMEPAGE = "http://www.gnu.org/software/libunistring/" |
15 | SECTION = "devel" | 15 | SECTION = "devel" |
16 | LICENSE = "LGPLv3+ | GPLv2" | 16 | LICENSE = "LGPL-3.0-or-later | GPL-2.0-or-later" |
17 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | 17 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ |
18 | file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \ | 18 | file://README;beginline=45;endline=65;md5=3a896a943b4da2c551e6be1af27eff8d \ |
19 | file://doc/libunistring.texi;md5=287fa6075f78a3c85c1a52b0a92547cd \ | 19 | file://doc/libunistring.texi;md5=36b7d20daef7fbcc032333ae2429aa94 \ |
20 | " | 20 | " |
21 | DEPENDS = "gperf-native" | ||
21 | 22 | ||
22 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ | 23 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz" |
23 | file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ | 24 | SRC_URI[sha256sum] = "fd6d5662fa706487c48349a758b57bc149ce94ec6c30624ec9fdc473ceabbc8e" |
24 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
25 | " | ||
26 | SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" | ||
27 | SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b" | ||
28 | 25 | ||
29 | inherit autotools texinfo | 26 | inherit autotools texinfo |
30 | BBCLASSEXTEND = "native nativesdk" | 27 | BBCLASSEXTEND = "native nativesdk" |