diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-03-09 20:55:54 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:25:21 -0700 |
| commit | 44e650f961888b75797da8ecc23654f672c5fae6 (patch) | |
| tree | 9f9618e5caf51dbd1294ef21bf46708a8ae674ef | |
| parent | c1596c6a26bc099a5f27f8a7f9feb7d07bd30cd5 (diff) | |
| download | openembedded-core-contrib-44e650f961888b75797da8ecc23654f672c5fae6.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch | 17 |
1 files changed, 7 insertions, 10 deletions
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 <chris_larson@mentor.com> 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 - |