diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2013-09-18 10:07:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-20 12:14:32 +0100 |
| commit | 0470bd7a9658d3d8aa10e9d081f42b61b9b7a6f4 (patch) | |
| tree | 8dfd5d5304510331eea444387bab713cb4c9fa47 | |
| parent | 57bec61b05c0fea42f988dd52942c7d5ce8833fd (diff) | |
| download | openembedded-core-0470bd7a9658d3d8aa10e9d081f42b61b9b7a6f4.tar.gz openembedded-core-0470bd7a9658d3d8aa10e9d081f42b61b9b7a6f4.tar.bz2 openembedded-core-0470bd7a9658d3d8aa10e9d081f42b61b9b7a6f4.zip | |
libunistring: remove the test to convert euc-jp in configure
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.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-support/libunistring/libunistring_0.9.3.bb | 4 |
2 files changed, 45 insertions, 1 deletions
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 new file mode 100644 index 0000000000..a330c73412 --- /dev/null +++ b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch @@ -0,0 +1,42 @@ +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(-) + +diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 +index f46ff14..de0a5e9 100644 +--- a/gnulib-m4/iconv.m4 ++++ b/gnulib-m4/iconv.m4 +@@ -126,17 +126,6 @@ int main () + } + } + #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)) +- return 1; + return 0; + }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in +-- +1.7.4 diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb b/meta/recipes-support/libunistring/libunistring_0.9.3.bb index 454a0e6c35..6cffef458a 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.3.bb @@ -19,7 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ file://parallelmake.patch \ - file://libunistring_fix_for_automake_1.12.patch" + file://libunistring_fix_for_automake_1.12.patch \ + file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ +" SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" |