Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 3 | Date: Tue, 5 Dec 2017 09:30:36 +0200 |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 4 | Subject: [PATCH] remove the test to convert euc-jp |
| 5 | |
| 6 | Remove the test "Test against HP-UX 11.11 bug: |
| 7 | No converter from EUC-JP to UTF-8 is provided" |
| 8 | since we don't support HP-UX and if the euc-jp is not |
| 9 | installed on the host, libunistring will be built without |
| 10 | iconv support and will cause guild-native configure fail. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [OE specific] |
| 13 | |
| 14 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 15 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | --- |
| 17 | gnulib-m4/iconv.m4 | 23 ----------------------- |
| 18 | 1 file changed, 23 deletions(-) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 20 | diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 |
| 21 | index b33ecd0..73b6aa1 100644 |
| 22 | --- a/gnulib-m4/iconv.m4 |
| 23 | +++ b/gnulib-m4/iconv.m4 |
| 24 | @@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK], |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 25 | } |
| 26 | } |
| 27 | #endif |
| 28 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is |
| 29 | - provided. */ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 30 | - { |
| 31 | - /* Try standardized names. */ |
| 32 | - iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); |
| 33 | - /* Try IRIX, OSF/1 names. */ |
| 34 | - iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); |
| 35 | - /* Try AIX names. */ |
| 36 | - iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); |
| 37 | - /* Try HP-UX names. */ |
| 38 | - iconv_t cd4 = iconv_open ("utf8", "eucJP"); |
| 39 | - if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) |
| 40 | - && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) |
| 41 | - result |= 16; |
| 42 | - if (cd1 != (iconv_t)(-1)) |
| 43 | - iconv_close (cd1); |
| 44 | - if (cd2 != (iconv_t)(-1)) |
| 45 | - iconv_close (cd2); |
| 46 | - if (cd3 != (iconv_t)(-1)) |
| 47 | - iconv_close (cd3); |
| 48 | - if (cd4 != (iconv_t)(-1)) |
| 49 | - iconv_close (cd4); |
| 50 | - } |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 51 | return result; |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 52 | ]])], |
| 53 | [am_cv_func_iconv_works=yes], , |
| 54 | -- |
| 55 | 2.4.0 |
| 56 | |