Patchwork [1/1] gettext-minimal-native/iconv.m4: remove the test to convert euc-jp

login
register
mail settings
Submitter jackie huang
Date Nov. 21, 2013, 7:39 a.m.
Message ID <4d489a2d6b0f8dbfd65c65fd0c62a1cf47b2b696.1385019181.git.jackie.huang@windriver.com>
Download mbox | patch
Permalink /patch/62123/
State Accepted
Commit bc6a3cf2c23c001b5f2d812a4ff3ca2b77d5796a
Headers show

Comments

jackie huang - Nov. 21, 2013, 7:39 a.m.
From: Jackie Huang <jackie.huang@windriver.com>

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>
---
 ...conv-m4-remove-the-test-to-convert-euc-jp.patch | 43 ++++++++++++++++++++++
 .../gettext/gettext-minimal-native_0.18.3.1.bb     |  4 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch

Patch

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 0000000..d453a74
--- /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 e46b19e..2b43b97 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"