From c4a386556afaaab3fcbb7e96274ff36e5bdb4b62 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Fri, 22 May 2015 17:21:43 +0800 Subject: 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] Signed-off-by: Roy Li Signed-off-by: Ross Burton --- ...-PATCH-Disable-the-test-to-convert-euc-jp.patch | 38 ++++++++++++++++++++++ .../gettext/gettext-minimal-native_0.19.4.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch (limited to 'meta/recipes-core/gettext') 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 @@ +[PATCH] Disable 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 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. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Roy Li +--- + iconv.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/iconv.m4 b/iconv.m4 +index 4e37363..35f54bd 100644 +--- a/iconv.m4 ++++ b/iconv.m4 +@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK], + } + } + #endif ++#if 0 + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ +@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK], + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + result |= 16; ++#endif + return result; + ]])], + [am_cv_func_iconv_works=yes], , +-- +2.0.1 + 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 \ file://Makefile.in.in \ file://remove-potcdate.sin \ file://COPYING \ + file://0001-PATCH-Disable-the-test-to-convert-euc-jp.patch \ " INHIBIT_DEFAULT_DEPS = "1" -- cgit 1.2.3-korg