summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-11-21 15:39:26 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-22 13:44:47 +0000
commitac902d0fdf44beda2d0954cc477a4e2b177a2f2a (patch)
treea7a5e487417c5871375bd8327451d61a5e2d80ea /meta/recipes-core/gettext
parent0188120691f433fdccf71b92618115195278c0af (diff)
downloadopenembedded-core-contrib-ac902d0fdf44beda2d0954cc477a4e2b177a2f2a.tar.gz
openembedded-core-contrib-ac902d0fdf44beda2d0954cc477a4e2b177a2f2a.tar.bz2
openembedded-core-contrib-ac902d0fdf44beda2d0954cc477a4e2b177a2f2a.zip
gettext-minimal-native/iconv.m4: 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 it causes guile-native compile failure if the euc-jp is not installed on the host. Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch43
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb4
2 files changed, 46 insertions, 1 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch
new file mode 100644
index 0000000000..d453a74b51
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch
@@ -0,0 +1,43 @@
+From 0bfade685783ccd193b2e1b94d0e4ef5ce449432 Mon Sep 17 00:00:00 2001
+From: Jackie Huang <jackie.huang@windriver.com>
+Date: Wed, 20 Nov 2013 17:52:50 +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 it causes
+guile-native compile failure if the euc-jp is not
+installed on the host
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ iconv.m4 | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/iconv.m4 b/iconv.m4
+index a503646..dbe7ca1 100644
+--- a/iconv.m4
++++ b/iconv.m4
+@@ -159,17 +159,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))
+- result |= 16;
+ return result;
+ }]])],
+ [am_cv_func_iconv_works=yes],
+--
+1.8.3
+
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb
index e46b19edc6..2b43b97022 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb
@@ -7,7 +7,9 @@ SRC_URI = "file://aclocal.tgz \
file://config.rpath \
file://Makefile.in.in \
file://remove-potcdate.sin \
- file://COPYING"
+ file://COPYING \
+ file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
+"
INHIBIT_DEFAULT_DEPS = "1"
INHIBIT_AUTOTOOLS_DEPS = "1"