diff options
| author |   Huang Qiyu <huangqy.fnst@cn.fujitsu.com> | 2018-01-30 16:58:38 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 10:54:35 +0000 |
| commit | 67b9f407f7c40c63c7f9518b4ee3d4d1cc7c75ce (patch) | |
| tree | 28966fa97ecff5de0f45a64e1f424a8df039830a /meta/recipes-devtools/ruby/ruby/extmk.patch | |
| parent | 23cf9be2065d6ea01f6d10cbed64a590c31e5bfc (diff) | |
| download | openembedded-core-67b9f407f7c40c63c7f9518b4ee3d4d1cc7c75ce.tar.gz | |
ruby: 2.4.2 -> 2.5.0
1.Upgrade ruby form 2.4.2 to 2.5.0.
2.Update the checksum of LIC_FILES_CHKSUM.
3.Delete ruby-CVE-2017-9224.patch, ruby-CVE-2017-9227.patch, ruby-CVE-2017-9229.patch, since it is integrated upstream.
4.Modify ruby-CVE-2017-9226.patch, since the data has been changed.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/ruby/ruby/extmk.patch')
| -rw-r--r-- | meta/recipes-devtools/ruby/ruby/extmk.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-devtools/ruby/ruby/extmk.patch b/meta/recipes-devtools/ruby/ruby/extmk.patch index a5b2184af5..404b9af7aa 100644 --- a/meta/recipes-devtools/ruby/ruby/extmk.patch +++ b/meta/recipes-devtools/ruby/ruby/extmk.patch @@ -2,13 +2,15 @@ Upstream-Status: Pending diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb --- ruby-1.8.7-p248.orig/ext/extmk.rb 2009-12-24 03:01:58.000000000 -0600 +++ ruby-1.8.7-p248/ext/extmk.rb 2010-02-12 15:55:27.370061558 -0600 -@@ -354,8 +354,8 @@ - $ruby = '$(topdir)/miniruby' + EXEEXT +@@ -413,8 +413,8 @@ def $mflags.defined?(var) end - $ruby << " -I'$(topdir)'" -+$ruby << " -I'$(top_srcdir)/lib'" + $ruby = [$ruby] + $ruby << "-I'$(topdir)'" ++$ruby << "-I'$(top_srcdir)/lib'" unless CROSS_COMPILING -- $ruby << " -I'$(top_srcdir)/lib'" - $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout - $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb" +- $ruby << "-I'$(top_srcdir)/lib'" + $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout ENV["RUBYLIB"] = "-" + end +-- + |