diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-01-12 18:20:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-14 22:10:54 +0000 |
commit | bbc0795ada93d943bf534289eaa7c07c5ffb7d44 (patch) | |
tree | a4799babf05503dd1ae12dbedb76725c7c82ff08 /meta/recipes-devtools/ruby/ruby/prevent-gc.patch | |
parent | e6aadcc2a04ae4e85b1cb00c5c9ce1c0f76ee871 (diff) | |
download | poky-bbc0795ada93d943bf534289eaa7c07c5ffb7d44.tar.gz |
ruby: update to 2.4.0
Existing version of ruby-native (2.2.5) was crashing on my machine (and others' too),
yet a functional ruby is necessary to upgrade webkit to a version that less vulnerable
to Spectre.
I've performed the update by copying the ruby recipe directory over from the current
pyro tree; if you want to see the list of specific commits, issue this command:
git log 99656fecf4fa6e24ba49ecb7f26f893e733818a0 meta/recipes-devtools/ruby
(up to commit e593d3aeb2ea5f08d6e0753133fe89e345b339e8)
(From OE-Core rev: 4734a4b41898e3df252b6234ed1270a915fd1f68)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby/prevent-gc.patch')
-rw-r--r-- | meta/recipes-devtools/ruby/ruby/prevent-gc.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/prevent-gc.patch b/meta/recipes-devtools/ruby/ruby/prevent-gc.patch deleted file mode 100644 index 2eaa955fba..0000000000 --- a/meta/recipes-devtools/ruby/ruby/prevent-gc.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | Fix marshaling with gcc7. Based on upstream revision 57410: | ||
2 | https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57410 | ||
3 | https://github.com/ruby/ruby/commit/7c1b30a602ab109d8d5388d7dfb3c5b180ba24e1 | ||
4 | https://bugs.ruby-lang.org/issues/13150 | ||
5 | |||
6 | with the upstream patches intent ported to Ruby 2.2.5 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> | ||
11 | |||
12 | Index: ruby-2.2.5/marshal.c | ||
13 | =================================================================== | ||
14 | --- ruby-2.2.5.orig/marshal.c | ||
15 | +++ ruby-2.2.5/marshal.c | ||
16 | @@ -17,7 +17,6 @@ | ||
17 | #include "ruby/io.h" | ||
18 | #include "ruby/st.h" | ||
19 | #include "ruby/util.h" | ||
20 | - | ||
21 | #include <math.h> | ||
22 | #ifdef HAVE_FLOAT_H | ||
23 | #include <float.h> | ||
24 | @@ -985,7 +984,7 @@ marshal_dump(int argc, VALUE *argv) | ||
25 | VALUE obj, port, a1, a2; | ||
26 | int limit = -1; | ||
27 | struct dump_arg *arg; | ||
28 | - VALUE wrapper; /* used to avoid memory leak in case of exception */ | ||
29 | + volatile VALUE wrapper; /* used to avoid memory leak in case of exception */ | ||
30 | |||
31 | port = Qnil; | ||
32 | rb_scan_args(argc, argv, "12", &obj, &a1, &a2); | ||