diff options
| author | Roy Li <rongqing.li@windriver.com> | 2014-07-09 16:47:17 +0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-07-15 15:00:12 +0200 |
| commit | 7ae118b002895094a27c6a0e3c77fe26425c39b4 (patch) | |
| tree | 188e541e2673b746a36dc25501f95c7cd5924cf2 /meta-ruby | |
| parent | 9ef549b77090ff0b03afd1dc5ab2a2e3bae26b33 (diff) | |
| download | ast2050-yocto-openembedded-7ae118b002895094a27c6a0e3c77fe26425c39b4.zip ast2050-yocto-openembedded-7ae118b002895094a27c6a0e3c77fe26425c39b4.tar.gz | |
ruby: uprev it to 1.9.3-p547
remove ruby-1.9.3-fix-s390x-build.patch, it has been merged into p547
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-ruby')
| -rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch | 12 | ||||
| -rw-r--r-- | meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb (renamed from meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb) | 5 |
2 files changed, 2 insertions, 15 deletions
diff --git a/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch b/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch deleted file mode 100644 index d0ade91..0000000 --- a/meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ruby-1.9.3-p0/ext/tk/extconf.rb.orig ruby-1.9.3-p0/ext/tk/extconf.rb ---- ruby-1.9.3-p0/ext/tk/extconf.rb.orig 2011-06-29 16:11:19.000000000 +0200 -+++ ruby-1.9.3-p0/ext/tk/extconf.rb 2011-10-18 16:15:59.406299659 +0200 -@@ -114,7 +114,7 @@ def is_macosx? - end - - def maybe_64bit? -- /64|universal/ =~ RUBY_PLATFORM -+ /64|universal|s390x/ =~ RUBY_PLATFORM - end - - def check_tcltk_version(version) diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb index ddba0da..2404a5f 100644 --- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb +++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb @@ -5,15 +5,14 @@ SRC_URI += "\ file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch \ file://ruby-1.9.3-always-use-i386.patch \ file://ruby-1.9.3-disable-versioned-paths.patch \ - file://ruby-1.9.3-fix-s390x-build.patch \ file://ruby-1.9.3-rubygems-1.8.11-uninstaller.patch \ file://ruby-1.9.3-custom-rubygems-location.patch \ file://rubygems-1.8.11-binary-extensions.patch \ file://ruby-1.9.3-mkmf-verbose.patch \ file://ruby-1.9.3-install-cross.patch \ " -SRC_URI[md5sum] = "993c72f7f805a9eb453f90b0b7fe0d2b" -SRC_URI[sha256sum] = "d192d1afc46a7ef27b9d0a3c7a67b509048984db2c38907aa82641bdf980acf4" +SRC_URI[md5sum] = "7531f9b1b35b16f3eb3d7bea786babfd" +SRC_URI[sha256sum] = "9ba118e4aba04c430bc4d5efb09b31a0277e101c9fd2ef3b80b9c684d7ae57a1" # it's unknown to configure script, but then passed to extconf.rb # maybe it's not really needed as we're hardcoding the result with |
