mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
ecabf7386f
Drop 0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch Drop 0001-musl-obstack-fts.patch (upstream has fixed the issues). Drop a few other chunks where upstream has fixed the issues or removed the code being patched. Adjust ptests to pass again. (From OE-Core rev: d358212bb557c99b266a0022ce973782c8c4d260) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From cd36f34c722dd0babd7beb13c968aa0780c9f726 Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Tue, 15 Aug 2017 17:24:06 +0800
|
|
Subject: [PATCH] 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>
|
|
|
|
Rebase to 0.170
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
---
|
|
m4/iconv.m4 | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/m4/iconv.m4 b/m4/iconv.m4
|
|
index aa159c5..d16312b 100644
|
|
--- a/m4/iconv.m4
|
|
+++ b/m4/iconv.m4
|
|
@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
}
|
|
}
|
|
#endif
|
|
+#if 0
|
|
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
|
provided. */
|
|
if (/* Try standardized names. */
|
|
@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
|
|
/* Try HP-UX names. */
|
|
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
|
result |= 16;
|
|
+#endif
|
|
return result;
|
|
]])],
|
|
[am_cv_func_iconv_works=yes], ,
|