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 | 40 | ||||
| -rw-r--r-- | meta/recipes-support/libunistring/libunistring_1.0.bb (renamed from meta/recipes-support/libunistring/libunistring_0.9.5.bb) | 17 |
3 files changed, 8 insertions, 79 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 @@ -From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - 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/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 d4489165bf..0000000000 --- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 16 Sep 2013 18:16:12 +0800 -Subject: [PATCH] remove the test to convert euc-jp - -Remove the test "Test against HP-UX 11.11 bug: -No converter from EUC-JP to UTF-8 is provided" -since we don't support HP-UX and if the euc-jp is not -installed on the host, libunistring will be built without -iconv support and will cause guild-native configure fail. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - gnulib-m4/iconv.m4 | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -Index: libunistring-0.9.4/gnulib-m4/iconv.m4 -=================================================================== ---- libunistring-0.9.4.orig/gnulib-m4/iconv.m4 2014-11-03 17:41:29.755011917 +0000 -+++ libunistring-0.9.4/gnulib-m4/iconv.m4 2014-11-03 17:43:03.795014480 +0000 -@@ -159,17 +159,6 @@ - } - } - #endif -- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is -- provided. */ -- if (/* Try standardized names. */ -- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) -- /* Try IRIX, OSF/1 names. */ -- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) -- /* Try AIX names. */ -- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) -- /* Try HP-UX names. */ -- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) -- result |= 16; - return result; - }]])], - [am_cv_func_iconv_works=yes], diff --git a/meta/recipes-support/libunistring/libunistring_0.9.5.bb b/meta/recipes-support/libunistring/libunistring_1.0.bb index 45cf633300..b6f5100ae8 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.5.bb +++ b/meta/recipes-support/libunistring/libunistring_1.0.bb @@ -13,16 +13,15 @@ DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\ HOMEPAGE = "http://www.gnu.org/software/libunistring/" SECTION = "devel" -LICENSE = "GPLv3 & LGPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6" +LICENSE = "LGPL-3.0-or-later | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://README;beginline=45;endline=65;md5=3a896a943b4da2c551e6be1af27eff8d \ + file://doc/libunistring.texi;md5=266e4297d7c18f197be3d9622ba99685 \ + " +DEPENDS = "gperf-native" -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] = "1a705bcdcb83799d544137617b377cfd" -SRC_URI[sha256sum] = "1a8c0772467850bef7197318a95f44abbb678ea83cbf119a3500cc7848276a17" +SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz" +SRC_URI[sha256sum] = "3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544" inherit autotools texinfo BBCLASSEXTEND = "native nativesdk" |