diff options
author | Roy Li <rongqing.li@windriver.com> | 2015-05-12 15:38:09 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-14 11:43:56 +0100 |
commit | 2682b78e130a1c409d1045c829e9198621c56582 (patch) | |
tree | fc2fc49fde4bedb9855291f180f4c537ffdf5ca4 | |
parent | f65a6821f4041a905cf6a37f9f409a2938de2350 (diff) | |
download | poky-2682b78e130a1c409d1045c829e9198621c56582.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]
(From OE-Core rev: 3dd269e027fda173ee40d671ea47da22300fd51d)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils-0.161/0001-remove-the-unneed-checking.patch | 38 | ||||
-rw-r--r-- | meta/recipes-devtools/elfutils/elfutils_0.161.bb | 1 |
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 @@ | |||
1 | Disable the test to convert euc-jp | ||
2 | |||
3 | Remove the test "Test against HP-UX 11.11 bug: | ||
4 | No converter from EUC-JP to UTF-8 is provided" | ||
5 | since we don't support HP-UX and if the euc-jp is not | ||
6 | installed on the host, the dependence will be built without | ||
7 | iconv support and will cause guild-native building fail. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | |||
11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
12 | --- | ||
13 | m4/iconv.m4 | 2 ++ | ||
14 | 1 file changed, 2 insertions(+) | ||
15 | |||
16 | diff --git a/m4/iconv.m4 b/m4/iconv.m4 | ||
17 | index a503646..299f1eb 100644 | ||
18 | --- a/m4/iconv.m4 | ||
19 | +++ b/m4/iconv.m4 | ||
20 | @@ -159,6 +159,7 @@ int main () | ||
21 | } | ||
22 | } | ||
23 | #endif | ||
24 | +#if 0 | ||
25 | /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is | ||
26 | provided. */ | ||
27 | if (/* Try standardized names. */ | ||
28 | @@ -170,6 +171,7 @@ int main () | ||
29 | /* Try HP-UX names. */ | ||
30 | && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | ||
31 | result |= 16; | ||
32 | +#endif | ||
33 | return result; | ||
34 | }]])], | ||
35 | [am_cv_func_iconv_works=yes], | ||
36 | -- | ||
37 | 2.0.1 | ||
38 | |||
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 += "\ | |||
17 | file://fixheadercheck.patch \ | 17 | file://fixheadercheck.patch \ |
18 | file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ | 18 | file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ |
19 | file://0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch \ | 19 | file://0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch \ |
20 | file://0001-remove-the-unneed-checking.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | # pick the patch from debian | 23 | # pick the patch from debian |