From 87118e6a2ed6da1ceaf484c326ec6d0ac8c1b8be Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 9 Mar 2018 20:55:49 +0200 Subject: m4: 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. Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-devtools/m4/m4/ac_config_links.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/m4/m4/ac_config_links.patch b/meta/recipes-devtools/m4/m4/ac_config_links.patch index 275c0b2e7d..71edf59512 100644 --- a/meta/recipes-devtools/m4/m4/ac_config_links.patch +++ b/meta/recipes-devtools/m4/m4/ac_config_links.patch @@ -14,10 +14,11 @@ Tested on x86_64_linux (Ubuntu 8.04 and 9.10). 2009-11-10 Esben Haabendal -diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure ---- m4-1.4.13.orig/configure 2009-11-10 10:54:00.301707097 +0100 -+++ m4-1.4.13/configure 2009-11-10 10:54:17.314206379 +0100 -@@ -14860,8 +14860,8 @@ +Index: m4-1.4.18/configure +=================================================================== +--- m4-1.4.18.orig/configure ++++ m4-1.4.18/configure +@@ -24415,8 +24415,8 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFD # only, it does not matter if we skip the link with older autoconf. # Automake 1.10.1 and earlier try to remove GNUmakefile in non-VPATH # builds, so use a shell variable to bypass this. @@ -27,4 +28,4 @@ diff -urN m4-1.4.13.orig/configure m4-1.4.13/configure + # ac_config_links="$ac_config_links $GNUmakefile:$GNUmakefile" - + : -- cgit 1.2.3-korg