summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:31 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commitaa0c57f6a521c0cb562c818316020ebe61fd797e (patch)
tree4573b5d6c6e4fa1504b14945c8d9228b9231af45 /meta/recipes-support
parent63fe020e5ec618a181ce799230245fdd6adeb232 (diff)
downloadpoky-aa0c57f6a521c0cb562c818316020ebe61fd797e.tar.gz
libffi: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 7ae4ce08071c02beaf09675c2c1ed70617b797dd) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libffi/libffi/not-win32.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-support/libffi/libffi/not-win32.patch b/meta/recipes-support/libffi/libffi/not-win32.patch
index 1e90125edd..80c40a4742 100644
--- a/meta/recipes-support/libffi/libffi/not-win32.patch
+++ b/meta/recipes-support/libffi/libffi/not-win32.patch
@@ -11,12 +11,16 @@ As this block is generally pointless, disable it.
11Upstream-Status: Inappropriate 11Upstream-Status: Inappropriate
12Signed-off-by: Ross Burton <ross.burton@intel.com> 12Signed-off-by: Ross Burton <ross.burton@intel.com>
13 13
14--- a/configure.ac~ 2014-11-12 11:56:51.000000000 +0000 14Index: libffi-3.2.1/configure.ac
15+++ b/configure.ac 2016-02-04 14:02:53.765710532 +0000 15===================================================================
16@@ -593,5 +593,5 @@ 16--- libffi-3.2.1.orig/configure.ac
17+++ libffi-3.2.1/configure.ac
18@@ -592,7 +592,7 @@ AC_ARG_ENABLE(purify-safety,
19
17 # These variables are only ever used when we cross-build to X86_WIN32. 20 # These variables are only ever used when we cross-build to X86_WIN32.
18 # And we only support this with GCC, so... 21 # And we only support this with GCC, so...
19-if test "x$GCC" = "xyes"; then 22-if test "x$GCC" = "xyes"; then
20+if false; then 23+if false; then
21 if test -n "$with_cross_host" && 24 if test -n "$with_cross_host" &&
22 test x"$with_cross_host" != x"no"; then \ No newline at end of file 25 test x"$with_cross_host" != x"no"; then
26 toolexecdir="${exec_prefix}"/'$(target_alias)'