summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-05-22 17:21:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-24 07:19:20 +0100
commit7a4d637402dd2cbd494f3d361d01b6dbe3051f03 (patch)
tree3804ad988c7f849528d4e5177257f45ac881629d
parentef19b19e358a46658949173873189dcabf6259bc (diff)
downloadpoky-7a4d637402dd2cbd494f3d361d01b6dbe3051f03.tar.gz
gettext-minimal-native: Disable the unnecessary check in iconv.m4
Disable 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, the dependence will be built without iconv support and will cause guile-native building fail. The patch is similar as 0470bd7a9658d3[libunistring: remove the test to convert euc-jp in configure] (From OE-Core rev: c4a386556afaaab3fcbb7e96274ff36e5bdb4b62) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch38
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
new file mode 100644
index 0000000000..29ef2a5a63
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
@@ -0,0 +1,38 @@
1[PATCH] Disable the test to convert euc-jp
2
3Remove the test "Test against HP-UX 11.11 bug:
4No converter from EUC-JP to UTF-8 is provided"
5since we don't support HP-UX and if the euc-jp is not
6installed on the host, the dependence will be built without
7iconv support and will cause guile-native building fail.
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 iconv.m4 | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/iconv.m4 b/iconv.m4
17index 4e37363..35f54bd 100644
18--- a/iconv.m4
19+++ b/iconv.m4
20@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
21 }
22 }
23 #endif
24+#if 0
25 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
26 provided. */
27 if (/* Try standardized names. */
28@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
29 /* Try HP-UX names. */
30 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
31 result |= 16;
32+#endif
33 return result;
34 ]])],
35 [am_cv_func_iconv_works=yes], ,
36--
372.0.1
38
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
index ca97315a85..1d4a443b7f 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
@@ -8,6 +8,7 @@ SRC_URI = "file://aclocal.tgz \
8 file://Makefile.in.in \ 8 file://Makefile.in.in \
9 file://remove-potcdate.sin \ 9 file://remove-potcdate.sin \
10 file://COPYING \ 10 file://COPYING \
11 file://0001-PATCH-Disable-the-test-to-convert-euc-jp.patch \
11" 12"
12 13
13INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"