diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2013-11-21 15:39:26 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 14:08:34 +0000 |
| commit | bc6a3cf2c23c001b5f2d812a4ff3ca2b77d5796a (patch) | |
| tree | 151384d9b4a73a725a09c8597699d84a793676d9 /meta | |
| parent | 33c97ee94ded3f3e5e55477ce86ca0206a3afb55 (diff) | |
| download | poky-bc6a3cf2c23c001b5f2d812a4ff3ca2b77d5796a.tar.gz | |
gettext-minimal-native/iconv.m4: 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.
(From OE-Core rev: ac902d0fdf44beda2d0954cc477a4e2b177a2f2a)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-0.18.3.1/iconv-m4-remove-the-test-to-convert-euc-jp.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext-minimal-native_0.18.3.1.bb | 4 |
2 files changed, 46 insertions, 1 deletions
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 0000000000..d453a74b51 --- /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 @@ | |||
| 1 | From 0bfade685783ccd193b2e1b94d0e4ef5ce449432 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
| 3 | Date: Wed, 20 Nov 2013 17:52:50 +0800 | ||
| 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 it causes | ||
| 9 | guile-native compile failure if the euc-jp is not | ||
| 10 | installed on the host | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [OE specific] | ||
| 13 | |||
| 14 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
| 15 | --- | ||
| 16 | iconv.m4 | 11 ----------- | ||
| 17 | 1 file changed, 11 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/iconv.m4 b/iconv.m4 | ||
| 20 | index a503646..dbe7ca1 100644 | ||
| 21 | --- a/iconv.m4 | ||
| 22 | +++ b/iconv.m4 | ||
| 23 | @@ -159,17 +159,6 @@ int main () | ||
| 24 | } | ||
| 25 | } | ||
| 26 | #endif | ||
| 27 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is | ||
| 28 | - provided. */ | ||
| 29 | - if (/* Try standardized names. */ | ||
| 30 | - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) | ||
| 31 | - /* Try IRIX, OSF/1 names. */ | ||
| 32 | - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) | ||
| 33 | - /* Try AIX names. */ | ||
| 34 | - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) | ||
| 35 | - /* Try HP-UX names. */ | ||
| 36 | - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | ||
| 37 | - result |= 16; | ||
| 38 | return result; | ||
| 39 | }]])], | ||
| 40 | [am_cv_func_iconv_works=yes], | ||
| 41 | -- | ||
| 42 | 1.8.3 | ||
| 43 | |||
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 e46b19edc6..2b43b97022 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 \ | |||
| 7 | file://config.rpath \ | 7 | file://config.rpath \ |
| 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://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ | ||
| 12 | " | ||
| 11 | 13 | ||
| 12 | INHIBIT_DEFAULT_DEPS = "1" | 14 | INHIBIT_DEFAULT_DEPS = "1" |
| 13 | INHIBIT_AUTOTOOLS_DEPS = "1" | 15 | INHIBIT_AUTOTOOLS_DEPS = "1" |
