On 9/17/2013 8:32 PM, Richard Purdie wrote:
On Tue, 2013-09-17 at 13:31 +0800, [email protected] wrote:
From: Jackie Huang <[email protected]>
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, libunistring will be built without
iconv support and will cause guild-native configure fail.
This information needs to be in the patch header...
Added and v2 is sent.
Thanks,
Jackie
Cheers,
Richard
Signed-off-by: Jackie Huang <[email protected]>
---
...conv-m4-remove-the-test-to-convert-euc-jp.patch | 36 ++++++++++++++++++++
.../libunistring/libunistring_0.9.3.bb | 4 ++-
2 files changed, 39 insertions(+), 1 deletions(-)
create mode 100644
meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
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
new file mode 100644
index 0000000..3f0f035
--- /dev/null
+++
b/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch
@@ -0,0 +1,36 @@
+From 8d99a368615656a835f5502326afd31cec2cebfe Mon Sep 17 00:00:00 2001
+From: Jackie Huang <[email protected]>
+Date: Mon, 16 Sep 2013 18:16:12 +0800
+Subject: [PATCH] remove the test to convert euc-jp
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Jackie Huang <[email protected]>
+---
+ gnulib-m4/iconv.m4 | 11 -----------
+ 1 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4
+index f46ff14..de0a5e9 100644
+--- a/gnulib-m4/iconv.m4
++++ b/gnulib-m4/iconv.m4
+@@ -126,17 +126,6 @@ int main ()
+ }
+ }
+ #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))
+- return 1;
+ return 0;
+ }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
+ [case "$host_os" in
+--
+1.7.4
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.3.bb
b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
index 454a0e6..6cffef4 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.3.bb
+++ b/meta/recipes-support/libunistring/libunistring_0.9.3.bb
@@ -19,7 +19,9 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
file://parallelmake.patch \
- file://libunistring_fix_for_automake_1.12.patch"
+ file://libunistring_fix_for_automake_1.12.patch \
+ file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \
+"
SRC_URI[md5sum] = "db8eca3b64163abadf8c40e5cecc261f"
SRC_URI[sha256sum] =
"610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3"
--
Jackie Huang
WIND RIVER | China Development Center
MSN:[email protected]
Tel: +86 8477 8594
Mobile: +86 138 1027 4745
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
