summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-09-18 10:07:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-22 12:19:33 +0100
commit10c85f54e524ab3cac0c3b236ff9e2ec677de086 (patch)
treee0d4a1471d7d08eb346b2321b8591dbe6ee6d7bd /meta
parent8ce33c4bcce6a8ba94bf2c4963c7134f044cab25 (diff)
downloadpoky-10c85f54e524ab3cac0c3b236ff9e2ec677de086.tar.gz
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. (From OE-Core rev: 0470bd7a9658d3d8aa10e9d081f42b61b9b7a6f4) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch42
-rw-r--r--meta/recipes-support/libunistring/libunistring_0.9.3.bb4
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 @@
1From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Mon, 16 Sep 2013 18:16:12 +0800
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 gnulib-m4/iconv.m4 | 11 -----------
17 1 files changed, 0 insertions(+), 11 deletions(-)
18
19diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
20index f46ff14..de0a5e9 100644
21--- a/gnulib-m4/iconv.m4
22+++ b/gnulib-m4/iconv.m4
23@@ -126,17 +126,6 @@ int main ()
24 }
25 }
26 #endif
27- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
28- provided. */
29- if (/* Try standardized names. */
30- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
31- /* Try IRIX, OSF/1 names. */
32- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
33- /* Try AIX names. */
34- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
35- /* Try HP-UX names. */
36- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
37- return 1;
38 return 0;
39 }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
40 [case "$host_os" in
41--
421.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 \
19 19
20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ 20SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
21 file://parallelmake.patch \ 21 file://parallelmake.patch \
22 file://libunistring_fix_for_automake_1.12.patch" 22 file://libunistring_fix_for_automake_1.12.patch \
23 file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
24"
23 25
24SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f" 26SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f"
25SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3" 27SRC_URI[sha256sum] = "610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3"