summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ruby
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-09 20:55:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-11 06:27:00 -0700
commita857e9a6e89e6c9737dcb4859e7d04f619eeaed7 (patch)
tree59442d221851e9179bb51937c2084cde78a2e5b7 /meta/recipes-devtools/ruby
parent0fffb6a8d896ee9055341c0033b6129d5d101ee4 (diff)
downloadpoky-a857e9a6e89e6c9737dcb4859e7d04f619eeaed7.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. (From OE-Core rev: 44e650f961888b75797da8ecc23654f672c5fae6) 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-devtools/ruby')
-rw-r--r--meta/recipes-devtools/ruby/ruby/0002-Obey-LDFLAGS-for-the-link-of-libruby.patch17
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>
10 Makefile.in | 2 +- 10 Makefile.in | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/Makefile.in b/Makefile.in 13Index: ruby-2.5.0/Makefile.in
14index 7da2488..5b4aea1 100644 14===================================================================
15--- a/Makefile.in 15--- ruby-2.5.0.orig/Makefile.in
16+++ b/Makefile.in 16+++ ruby-2.5.0/Makefile.in
17@@ -75,7 +75,7 @@ EXTLIBS = 17@@ -77,7 +77,7 @@ LIBS = @LIBS@ $(EXTLIBS)
18 LIBS = @LIBS@ $(EXTLIBS)
19 MISSING = @LIBOBJS@ @ALLOCA@ 18 MISSING = @LIBOBJS@ @ALLOCA@
19 ENABLE_SHARED = @ENABLE_SHARED@
20 LDSHARED = @LIBRUBY_LDSHARED@ 20 LDSHARED = @LIBRUBY_LDSHARED@
21-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) 21-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
22+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) 22+DLDFLAGS = @LIBRUBY_DLDFLAGS@ @LDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
23 SOLIBS = @SOLIBS@ 23 SOLIBS = @SOLIBS@
24 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
24 MAINLIBS = @MAINLIBS@ 25 MAINLIBS = @MAINLIBS@
25 ARCHMINIOBJS = @MINIOBJS@
26--
272.8.0
28