diff options
Diffstat (limited to 'meta')
5 files changed, 3 insertions, 100 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 @@ | |||
1 | From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Tue, 15 Aug 2017 17:24:06 +0800 | ||
4 | Subject: [PATCH] Disable 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 if the euc-jp is not | ||
9 | installed on the host, the dependence will be built without | ||
10 | iconv support and will cause guild-native building fail. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
15 | |||
16 | Rebase to 0.170 | ||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | |||
19 | --- | ||
20 | m4/iconv.m4 | 2 ++ | ||
21 | 1 file changed, 2 insertions(+) | ||
22 | |||
23 | diff --git a/m4/iconv.m4 b/m4/iconv.m4 | ||
24 | index 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], , | ||
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 deleted file mode 100644 index 9e8ce2270d..0000000000 --- a/meta/recipes-support/libunistring/libunistring/iconv-m4-remove-the-test-to-convert-euc-jp.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | From 30562065ba9e4c238e76100b5f9f0c5add0e635b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Tue, 5 Dec 2017 09:30:36 +0200 | ||
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 if the euc-jp is not | ||
9 | installed on the host, libunistring will be built without | ||
10 | iconv support and will cause guild-native configure fail. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE specific] | ||
13 | |||
14 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
15 | --- | ||
16 | --- | ||
17 | gnulib-m4/iconv.m4 | 23 ----------------------- | ||
18 | 1 file changed, 23 deletions(-) | ||
19 | |||
20 | diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 | ||
21 | index b33ecd0..73b6aa1 100644 | ||
22 | --- a/gnulib-m4/iconv.m4 | ||
23 | +++ b/gnulib-m4/iconv.m4 | ||
24 | @@ -165,29 +165,6 @@ AC_DEFUN([AM_ICONV_LINK], | ||
25 | } | ||
26 | } | ||
27 | #endif | ||
28 | - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is | ||
29 | - provided. */ | ||
30 | - { | ||
31 | - /* Try standardized names. */ | ||
32 | - iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); | ||
33 | - /* Try IRIX, OSF/1 names. */ | ||
34 | - iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); | ||
35 | - /* Try AIX names. */ | ||
36 | - iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); | ||
37 | - /* Try HP-UX names. */ | ||
38 | - iconv_t cd4 = iconv_open ("utf8", "eucJP"); | ||
39 | - if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1) | ||
40 | - && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1)) | ||
41 | - result |= 16; | ||
42 | - if (cd1 != (iconv_t)(-1)) | ||
43 | - iconv_close (cd1); | ||
44 | - if (cd2 != (iconv_t)(-1)) | ||
45 | - iconv_close (cd2); | ||
46 | - if (cd3 != (iconv_t)(-1)) | ||
47 | - iconv_close (cd3); | ||
48 | - if (cd4 != (iconv_t)(-1)) | ||
49 | - iconv_close (cd4); | ||
50 | - } | ||
51 | return result; | ||
52 | ]])], | ||
53 | [am_cv_func_iconv_works=yes], , | ||
54 | -- | ||
55 | 2.4.0 | ||
56 | |||
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_0.9.10.bb index 97fac4ecfa..0a7b18ed08 100644 --- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb +++ b/meta/recipes-support/libunistring/libunistring_0.9.10.bb | |||
@@ -20,7 +20,6 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ | |||
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ | 22 | SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \ |
23 | file://iconv-m4-remove-the-test-to-convert-euc-jp.patch \ | ||
24 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | 23 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ |
25 | " | 24 | " |
26 | SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" | 25 | SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b" |
diff --git a/meta/site/common-linux b/meta/site/common-linux index 1c1fdafbb0..8f23adeab4 100644 --- a/meta/site/common-linux +++ b/meta/site/common-linux | |||
@@ -1,6 +1,9 @@ | |||
1 | # gettext - these add sleep delays otherwise | 1 | # gettext - these add sleep delays otherwise |
2 | gl_cv_func_sleep_works=${gl_cv_func_sleep_works=yes} | 2 | gl_cv_func_sleep_works=${gl_cv_func_sleep_works=yes} |
3 | gl_cv_header_working_fcntl_h=${gl_cv_header_working_fcntl_h=yes} | 3 | gl_cv_header_working_fcntl_h=${gl_cv_header_working_fcntl_h=yes} |
4 | # the euc-jp tests in iconv.m4 break elfutils and libunistring depending on the | ||
5 | # host locales installed. Avoid this by skipping the tests, we're not on HP-UX! | ||
6 | am_cv_func_iconv_works=${am_cv_func_iconv_works=yes} | ||
4 | 7 | ||
5 | # apr | 8 | # apr |
6 | ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} | 9 | ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} |