1 files changed, 36 insertions, 20 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
index d4489165bf..9e8ce2270d 100644
--- 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
@@ -1,6 +1,6 @@
-From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001
+From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001
 From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 16 Sep 2013 18:16:12 +0800
+Date: Tue, 5 Dec 2017 09:30:36 +0200
 Subject: [PATCH] remove the test to convert euc-jp
 
 Remove the test "Test against HP-UX 11.11 bug:
@@ -13,28 +13,44 @@ 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(-)
+---
+ gnulib-m4/iconv.m4 | 23 -----------------------
+ 1 file changed, 23 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 @@
+diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
+index b33ecd0..73b6aa1 100644
+--- a/gnulib-m4/iconv.m4
++++ b/gnulib-m4/iconv.m4
+@@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK],
        }
    }
  #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;
+-  {
+-    /* Try standardized names.  */
+-    iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+-    /* Try IRIX, OSF/1 names.  */
+-    iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+-    /* Try AIX names.  */
+-    iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+-    /* Try HP-UX names.  */
+-    iconv_t cd4 = iconv_open ("utf8", "eucJP");
+-    if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+-        && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+-      result |= 16;
+-    if (cd1 != (iconv_t)(-1))
+-      iconv_close (cd1);
+-    if (cd2 != (iconv_t)(-1))
+-      iconv_close (cd2);
+-    if (cd3 != (iconv_t)(-1))
+-      iconv_close (cd3);
+-    if (cd4 != (iconv_t)(-1))
+-      iconv_close (cd4);
+-  }
    return result;
- }]])],
-         [am_cv_func_iconv_works=yes],
+ ]])],
+           [am_cv_func_iconv_works=yes], ,
+-- 
+2.4.0
+