From: Ross Burton Date: Fri, 9 Mar 2018 18:55:54 +0000 (+0200) Subject: ruby: refresh patches X-Git-Tag: uninative-1.9~231 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=44e650f961888b75797da8ecc23654f672c5fae6;p=openembedded-core.git ruby: 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 --- diff --git a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch index b0114ba28b..4cf579f427 100644 --- a/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch +++ b/meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch @@ -10,19 +10,16 @@ Signed-off-by: Christopher Larson Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index 7da2488..5b4aea1 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -75,7 +75,7 @@ EXTLIBS = - LIBS = @LIBS@ $(EXTLIBS) +Index: ruby-2.5.0/Makefile.in +=================================================================== +--- ruby-2.5.0.orig/Makefile.in ++++ ruby-2.5.0/Makefile.in +@@ -77,7 +77,7 @@ LIBS = @LIBS@ $(EXTLIBS) MISSING = @LIBOBJS@ @ALLOCA@ + ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ -DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) +DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ + ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ MAINLIBS = @MAINLIBS@ - ARCHMINIOBJS = @MINIOBJS@ --- -2.8.0 -