summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-05-12 15:38:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:41:10 +0100
commit3dd269e027fda173ee40d671ea47da22300fd51d (patch)
tree76db5525510fe17996db4cc9da8ebca4d25e35bc /meta
parent93d8becf19cc72df650d3aaff7e3ea188bd6e09e (diff)
downloadopenembedded-core-3dd269e027fda173ee40d671ea47da22300fd51d.tar.gz
elfutils: 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 guild-native building fail. The patch is similar as 0470bd7a9658d3[libunistring: remove the test to convert euc-jp in configure] Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch38
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.161.bb1
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
new file mode 100644
index 0000000000..5be92d705a
--- /dev/null
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch
@@ -0,0 +1,38 @@
+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 guild-native building fail.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ m4/iconv.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/m4/iconv.m4 b/m4/iconv.m4
+index a503646..299f1eb 100644
+--- a/m4/iconv.m4
++++ b/m4/iconv.m4
+@@ -159,6 +159,7 @@ int main ()
+ }
+ }
+ #endif
++#if 0
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ if (/* Try standardized names. */
+@@ -170,6 +171,7 @@ int main ()
+ /* 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-devtools/elfutils/elfutils_0.161.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
index e111b34a8a..70a3c16cf5 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.161.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
@@ -17,6 +17,7 @@ SRC_URI += "\
file://fixheadercheck.patch \
file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \
file://0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch \
+ file://0001-remove-the-unneed-checking.patch \
"
# pick the patch from debian