summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/elfutils
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-22 21:47:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-23 22:51:25 +0000
commitd340067a21e2aac3bf918d07b8c1280b2466fb98 (patch)
tree76a9cad75b5fc4adbd3788f523d0989e1819bd44 /meta/recipes-devtools/elfutils
parent5fdfa9e3cdcc316548414573437c751c57cc76dc (diff)
downloadpoky-d340067a21e2aac3bf918d07b8c1280b2466fb98.tar.gz
site/elfutils/libunistring: Drop patching for iconv and set in site file
The standard macros from gettext for iconv include problematic tests which we've been patching out adhoc. Stop doing this and set results in the site files instead which is simpler, more maintainable and peforms better too as an added bonus. (From OE-Core rev: 5a3bfdc4af18302cf0e3ea5802fdfefaa7235657) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/elfutils')
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.183.bb1
-rw-r--r--meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch42
2 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.183.bb b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
index 16ed7c9ddb..c0833686de 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.183.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.183.bb
@@ -14,7 +14,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
14 file://0001-dso-link-change.patch \ 14 file://0001-dso-link-change.patch \
15 file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \ 15 file://0002-Fix-elf_cvt_gunhash-if-dest-and-src-are-same.patch \
16 file://0003-fixheadercheck.patch \ 16 file://0003-fixheadercheck.patch \
17 file://0004-Disable-the-test-to-convert-euc-jp.patch \
18 file://0006-Fix-build-on-aarch64-musl.patch \ 17 file://0006-Fix-build-on-aarch64-musl.patch \
19 file://0001-libasm-may-link-with-libbz2-if-found.patch \ 18 file://0001-libasm-may-link-with-libbz2-if-found.patch \
20 file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \ 19 file://0001-libelf-elf_end.c-check-data_list.data.d.d_buf-before.patch \
diff --git a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
deleted file mode 100644
index f407bdd0be..0000000000
--- a/meta/recipes-devtools/elfutils/files/0004-Disable-the-test-to-convert-euc-jp.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 15 Aug 2017 17:24:06 +0800
4Subject: [PATCH] Disable the test to convert euc-jp
5
6Remove the test "Test against HP-UX 11.11 bug:
7No converter from EUC-JP to UTF-8 is provided"
8since we don't support HP-UX and if the euc-jp is not
9installed on the host, the dependence will be built without
10iconv support and will cause guild-native building fail.
11
12Upstream-Status: Inappropriate [OE specific]
13
14Signed-off-by: Roy Li <rongqing.li@windriver.com>
15
16Rebase to 0.170
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18
19---
20 m4/iconv.m4 | 2 ++
21 1 file changed, 2 insertions(+)
22
23diff --git a/m4/iconv.m4 b/m4/iconv.m4
24index aa159c5..d16312b 100644
25--- a/m4/iconv.m4
26+++ b/m4/iconv.m4
27@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
28 }
29 }
30 #endif
31+#if 0
32 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
33 provided. */
34 if (/* Try standardized names. */
35@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
36 /* Try HP-UX names. */
37 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
38 result |= 16;
39+#endif
40 return result;
41 ]])],
42 [am_cv_func_iconv_works=yes], ,