From 7ae118b002895094a27c6a0e3c77fe26425c39b4 Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Wed, 9 Jul 2014 16:47:17 +0800
Subject: 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>
---
 .../ruby/ruby/ruby-1.9.3-fix-s390x-build.patch     | 12 ------
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb | 46 ----------------------
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb | 45 +++++++++++++++++++++
 3 files changed, 45 insertions(+), 58 deletions(-)
 delete mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
 delete mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb

(limited to 'meta-ruby')

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 d0ade91a44..0000000000
--- 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-p429.bb
deleted file mode 100644
index ddba0da24b..0000000000
--- a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-require ruby.inc
-PR = "${INC_PR}.0"
-
-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"
-
-# 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
-# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
-UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
-
-EXTRA_OECONF = "\
-    --enable-wide-getaddrinfo \
-    --disable-versioned-paths \
-    --disable-rpath \
-    --enable-shared \
-    --enable-load-relative \
-"
-
-EXTRA_OEMAKE = " \
-    LIBRUBYARG='-lruby-static' \
-"
-
-do_install() {
-    oe_runmake 'DESTDIR=${D}' install
-}
-
-FILES_${PN} += "${datadir}/rubygems \
-                ${datadir}/ri"
-
-FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \
-                    ${libdir}/ruby/*/*/.debug \
-                    ${libdir}/ruby/*/*/*/.debug"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb
new file mode 100644
index 0000000000..2404a5fdab
--- /dev/null
+++ b/meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p547.bb
@@ -0,0 +1,45 @@
+require ruby.inc
+PR = "${INC_PR}.0"
+
+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-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] = "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
+# 0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+UNKNOWN_CONFIGURE_WHITELIST += "--enable-wide-getaddrinfo"
+
+EXTRA_OECONF = "\
+    --enable-wide-getaddrinfo \
+    --disable-versioned-paths \
+    --disable-rpath \
+    --enable-shared \
+    --enable-load-relative \
+"
+
+EXTRA_OEMAKE = " \
+    LIBRUBYARG='-lruby-static' \
+"
+
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES_${PN} += "${datadir}/rubygems \
+                ${datadir}/ri"
+
+FILES_${PN}-dbg += "${libdir}/ruby/*/.debug \
+                    ${libdir}/ruby/*/*/.debug \
+                    ${libdir}/ruby/*/*/*/.debug"
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg