Skip to contentSkip to conversation

backport meta-ruby

PATCH Applied Martin Jansa 2 participants 6 messages Feb 28, 2013 – Mar 8, 2013

lore
Share & tools
lore
#0 lore raw

cover backport meta-ruby

I know that adding new layer is not typical "backport", but we need ruby in danny and IIRC Koen also needs.

Also because it's separate layer, there is no danger to users which don't need or use it.

The following changes since commit c02834a7cc5fda525c7ebeec545625233bab4cb5:

xf86-video-geode: Update to 2.11.14 (2013-02-15 12:16:55 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib jansa/for-danny3
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/for-danny3

Jackie Huang (2):
ruby: Add from OE-Classic
ruby: update to 1.9.3-194

Martin Jansa (1):
meta-ruby: add empty layer

 meta-ruby/COPYING.MIT                              |  17 ++
 meta-ruby/README                                   |  15 ++
 meta-ruby/conf/layer.conf                          |   9 +
 meta-ruby/recipes-devtools/ruby/ruby.inc           |  43 +++
 ...onf-hardcode-wide-getaddr-info-test-outco.patch |  26 ++
 meta-ruby/recipes-devtools/ruby/ruby/extmk.patch   |  13 +
 .../recipes-devtools/ruby/ruby/extmk_run.patch     |  15 ++
 .../ruby/ruby/ruby-1.9.3-always-use-i386.patch     |  11 +
 .../ruby/ruby/ruby-1.9.3-bignum-test-fix.patch     |  31 +++
 .../ruby/ruby-1.9.3-custom-rubygems-location.patch |  86 ++++++
 .../ruby/ruby-1.9.3-disable-versioned-paths.patch  | 149 +++++++++++
 .../ruby/ruby/ruby-1.9.3-fix-s390x-build.patch     |  12 +
 .../ruby/ruby/ruby-1.9.3-install-cross.patch       |  16 ++
 .../ruby/ruby/ruby-1.9.3-mkmf-verbose.patch        |  11 +
 .../ruby-1.9.3-rubygems-1.8.11-uninstaller.patch   |  76 ++++++
 .../ruby/ruby/ruby-1.9.3-webrick-test-fix.patch    |  24 ++
 .../ruby/rubygems-1.8.11-binary-extensions.patch   | 296 +++++++++++++++++++++
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb |  50 ++++
 18 files changed, 900 insertions(+)
 create mode 100644 meta-ruby/COPYING.MIT
 create mode 100644 meta-ruby/README
 create mode 100644 meta-ruby/conf/layer.conf
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby.inc
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/extmk.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-always-use-i386.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-bignum-test-fix.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-custom-rubygems-location.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-disable-versioned-paths.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-install-cross.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-mkmf-verbose.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-rubygems-1.8.11-uninstaller.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-webrick-test-fix.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/rubygems-1.8.11-binary-extensions.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/3 meta-ruby: add empty layer

---
 meta-ruby/COPYING.MIT     | 17 +++++++++++++++++
 meta-ruby/README          | 15 +++++++++++++++
 meta-ruby/conf/layer.conf |  9 +++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 meta-ruby/COPYING.MIT
 create mode 100644 meta-ruby/README
 create mode 100644 meta-ruby/conf/layer.conf
meta-ruby/COPYING.MIT new file +17 -0
new file mode 100644
index 0000000..fb950dc
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
meta-ruby/README new file +15 -0
new file mode 100644
index 0000000..51cab2b
@@ -0,0 +1,15 @@
+This layer depends on:
+
+URI: git://git.openembedded.org/openembedded-core
+branch: master
+revision: HEAD
+
+URI: git://git.openembedded.org/meta-openembedded
+branch: master
+revision: HEAD
+
+Send pull requests to [email protected] with '[meta-oe]' in the subject'
+
+When sending single patches, please using something like 'git send-email -1 --to [email protected] --subject-prefix=meta-oe][PATCH'
+
+Interim layer maintainer: Martin Jansa <[email protected]>
meta-ruby/conf/layer.conf new file +9 -0
new file mode 100644
index 0000000..6c2369f
@@ -0,0 +1,9 @@
+# We have a conf and classes directory, append to BBPATH 
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "ruby-layer"
+BBFILE_PATTERN_ruby-layer := "^${LAYERDIR}/"
+BBFILE_PRIORITY_ruby-layer = "7"
Signature · 1 line
1.8.1.4
#2 lore raw

PATCH 2/3 ruby: Add from OE-Classic

In reply to Martin Jansa

From: Jackie Huang <[email protected]>

* No modifications in this commit
* MJ: PR reset, PRIORITY dropped, LICENSE fix, LIC_FILES_CHKSUMs added

---
 meta-ruby/recipes-devtools/ruby/ruby.inc           | 38 ++++++++++++++++++++++
 ...onf-hardcode-wide-getaddr-info-test-outco.patch | 31 ++++++++++++++++++
 meta-ruby/recipes-devtools/ruby/ruby/extmk.patch   | 13 ++++++++
 .../recipes-devtools/ruby/ruby/extmk_run.patch     | 15 +++++++++
 meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb | 12 +++++++
 5 files changed, 109 insertions(+)
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby.inc
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/extmk.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb
meta-ruby/recipes-devtools/ruby/ruby.inc new file +38 -0
new file mode 100644
index 0000000..a70f951
@@ -0,0 +1,38 @@
+DESCRIPTION = "Ruby is an interpreted scripting language \
+for quick and easy object-oriented programming."
+SECTION = "devel/ruby"
+LICENSE = "GPLv2 & LGPLv2+ & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=99f88e67b65504d289a0326c59f9c148 \
+                    file://LEGAL;md5=7d502ae3b621dc406b220dadddb72e16 \
+                    file://LGPL;md5=7fbc338309ac38fefcd64b04bb903e34 \
+"
+
+DEPENDS = "ruby-native zlib openssl"
+DEPENDS_virtclass-native = ""
+
+INC_PR = "r0"
+
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
+           file://extmk_run.patch \
+           file://extmk.patch \
+"
+
+S = "${WORKDIR}/ruby-${PV}"
+
+inherit autotools
+
+# fix building of socket extension
+EXTRA_OECONF = "--enable-wide-getaddrinfo"
+
+# This snippet lets compiled extensions which rely on external libraries,
+# such as zlib, compile properly.  If we don't do this, then when extmk.rb
+# runs, it uses the native libraries instead of the target libraries, and so
+# none of the linking operations succeed -- which makes extconf.rb think
+# that the libraries aren't available and hence that the extension can't be
+# built.
+
+do_configure_prepend() {
+	sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
+	rm -rf ${S}/ruby/
+}
meta-ruby/recipes-devtools/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch new file +31 -0
new file mode 100644
index 0000000..64f093a
@@ -0,0 +1,31 @@
+From 9341293e71c03fe606edc9157bf1e13e3dd5b507 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <[email protected]>
+Date: Fri, 17 Dec 2010 11:35:38 +0100
+Subject: [PATCH] socket extconf: hardcode wide-getaddr info test outcome to true
+
+Without this the socket extension doesn't build correctly
+
+Signed-off-by: Koen Kooi <[email protected]>
+---
+ ext/socket/extconf.rb |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
+index ece6158..5fba46c 100644
+--- a/ext/socket/extconf.rb
++++ b/ext/socket/extconf.rb
+@@ -222,6 +222,11 @@ main()
+   exit(EXIT_FAILURE);
+ }
+ EOF
++
++# Ignore the actual result of the above test and assume that
++# everything is OK.
++getaddr_info_ok = true
++
+ end
+ if ipv6 and not getaddr_info_ok
+   abort <<EOS
+-- 
+1.6.6.1
+
meta-ruby/recipes-devtools/ruby/ruby/extmk.patch new file +13 -0
new file mode 100644
index 0000000..8b68450
@@ -0,0 +1,13 @@
+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
+ end
+ $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"
+   ENV["RUBYLIB"] = "-"
meta-ruby/recipes-devtools/ruby/ruby/extmk_run.patch new file +15 -0
new file mode 100644
index 0000000..57926f5
@@ -0,0 +1,15 @@
+============================================================
+--- packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
++++ packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
+@@ -0,0 +1,11 @@
++--- ruby-1.8.5/common.mk.orig	2006-12-30 13:07:32.000000000 +1100
+++++ ruby-1.8.5/common.mk	2006-12-30 13:08:32.000000000 +1100
++@@ -56,7 +56,7 @@
++ 		--make="$(MAKE)" \
++ 		--mflags="$(MFLAGS)" \
++ 		--make-flags="$(MAKEFLAGS)"
++-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
+++EXTMK_ARGS    =	$(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
++ 
++ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
++ 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb new file +12 -0
new file mode 100644
index 0000000..299187c
@@ -0,0 +1,12 @@
+require ruby.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch"
+
+SRC_URI[md5sum] = "f446550dfde0d8162a6ed8d5a38b3ac2"
+SRC_URI[sha256sum] = "5883df5204de70762602ce885b18c8bf6c856d33298c35df9151031b2ce044a1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+                    ${libdir}/ruby/1.8/*/*/.debug"
+BBCLASSEXTEND = "native"
+
Signature · 1 line
1.8.1.4
#3 lore raw

PATCH 3/3 ruby: update to 1.9.3-194

In reply to Martin Jansa

From: Jackie Huang <[email protected]>

I sent this to oe-core but was told that it's not the right place and was suggested to send here.

Most of the 1.9.3 patches originate from ruby-1.9.3.194-10.1.fc17.src.rpm

---
 meta-ruby/recipes-devtools/ruby/ruby.inc           |  27 +-
 ...onf-hardcode-wide-getaddr-info-test-outco.patch |  11 +-
 .../ruby/ruby/ruby-1.9.3-always-use-i386.patch     |  11 +
 .../ruby/ruby/ruby-1.9.3-bignum-test-fix.patch     |  31 +++
 .../ruby/ruby-1.9.3-custom-rubygems-location.patch |  86 ++++++
 .../ruby/ruby-1.9.3-disable-versioned-paths.patch  | 149 +++++++++++
 .../ruby/ruby/ruby-1.9.3-fix-s390x-build.patch     |  12 +
 .../ruby/ruby/ruby-1.9.3-install-cross.patch       |  16 ++
 .../ruby/ruby/ruby-1.9.3-mkmf-verbose.patch        |  11 +
 .../ruby-1.9.3-rubygems-1.8.11-uninstaller.patch   |  76 ++++++
 .../ruby/ruby/ruby-1.9.3-webrick-test-fix.patch    |  24 ++
 .../ruby/rubygems-1.8.11-binary-extensions.patch   | 296 +++++++++++++++++++++
 meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb |  12 -
 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb |  50 ++++
 14 files changed, 781 insertions(+), 31 deletions(-)
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-always-use-i386.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-bignum-test-fix.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-custom-rubygems-location.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-disable-versioned-paths.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-install-cross.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-mkmf-verbose.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-rubygems-1.8.11-uninstaller.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-webrick-test-fix.patch
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby/rubygems-1.8.11-binary-extensions.patch
 delete mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb
 create mode 100644 meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb
meta-ruby/recipes-devtools/ruby/ruby.inc +16 -11
index a70f951..894e3e6 100644
@@ -1,19 +1,26 @@
-DESCRIPTION = "Ruby is an interpreted scripting language \
-for quick and easy object-oriented programming."
+SUMMARY = "An interpreter of object-oriented scripting language"
+DESCRIPTION = "Ruby is an interpreted scripting language for quick \
+and easy object-oriented programming. It has many features to process \
+text files and to do system management tasks (as in Perl). \
+It is simple, straight-forward, and extensible. \
+"
+HOMEPAGE = "http://www.ruby-lang.org/"
 SECTION = "devel/ruby"
-LICENSE = "GPLv2 & LGPLv2+ & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=99f88e67b65504d289a0326c59f9c148 \
-                    file://LEGAL;md5=7d502ae3b621dc406b220dadddb72e16 \
-                    file://LGPL;md5=7fbc338309ac38fefcd64b04bb903e34 \
+LICENSE = "Ruby | BSD | GPLv2"
+LIC_FILES_CHKSUM = "\
+  file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \
+  file://BSDL;md5=3949e007205deef714bd225e1ee4a8ea \
+  file://GPL;md5=393a5ca445f6965873eca0259a17f833 \
+  file://LEGAL;md5=e88686821918c0b6d2b1b8328116cec5 \
 "
 
-DEPENDS = "ruby-native zlib openssl"
+DEPENDS = "ruby-native zlib openssl tcl"
 DEPENDS_virtclass-native = ""
 
-INC_PR = "r0"
+INC_PR = "r1"
 
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
+SRC_URI = "http://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://extmk_run.patch \
            file://extmk.patch \
 "
@@ -22,8 +29,6 @@ S = "${WORKDIR}/ruby-${PV}"
 
 inherit autotools
 
-# fix building of socket extension
-EXTRA_OECONF = "--enable-wide-getaddrinfo"
 
 # This snippet lets compiled extensions which rely on external libraries,
 # such as zlib, compile properly.  If we don't do this, then when extmk.rb
meta-ruby/recipes-devtools/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch +3 -8
index 64f093a..712602a 100644
@@ -8,13 +8,11 @@ Without this the socket extension doesn't build correctly
 Signed-off-by: Koen Kooi <[email protected]>
 ---
  ext/socket/extconf.rb |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
-diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
-index ece6158..5fba46c 100644
 --- a/ext/socket/extconf.rb
 +++ b/ext/socket/extconf.rb
-@@ -222,6 +222,11 @@ main()
+@@ -356,6 +356,11 @@
    exit(EXIT_FAILURE);
  }
  EOF
@@ -23,9 +21,6 @@ index ece6158..5fba46c 100644
 +# everything is OK.
 +getaddr_info_ok = true
 +
- end
  if ipv6 and not getaddr_info_ok
    abort <<EOS
--- 
-1.6.6.1
-
+ 
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-always-use-i386.patch new file +11 -0
new file mode 100644
index 0000000..f5a8c3d
@@ -0,0 +1,11 @@
+--- a/configure.in.orig	2011-10-18 08:56:21.587594685 +0200
++++ b/configure.in	2011-10-18 08:56:59.751593321 +0200
+@@ -2935,6 +2935,8 @@
+ configure_args=$ac_configure_args
+ AC_SUBST(configure_args)dnl
+ 
++target_cpu=`echo $target_cpu | sed s/i.86/i386/`
++
+ if test "${universal_binary-no}" = yes ; then
+     arch="universal-${target_os}"
+     AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-bignum-test-fix.patch new file +31 -0
new file mode 100644
index 0000000..cb3682d
@@ -0,0 +1,31 @@
+--- ruby-1.9.3-p0/test/ruby/test_bignum.rb.orig	2011-11-10 09:52:59.101925465 +0100
++++ ruby-1.9.3-p0/test/ruby/test_bignum.rb	2011-11-10 09:54:14.580798826 +0100
+@@ -378,7 +378,7 @@
+     assert_equal(true, (2**32).even?)
+   end
+ 
+-  def interrupt
++  def assert_interrupt
+     time = Time.now
+     start_flag = false
+     end_flag = false
+@@ -387,14 +387,16 @@
+       yield
+       end_flag = true
+     end
+-    sleep 1
++    Thread.pass until start_flag
+     thread.raise
+     thread.join rescue nil
+-    start_flag && !end_flag && Time.now - time < 10
++    time = Time.now - time
++    assert_equal([true, false], [start_flag, end_flag])
++    assert_operator(time, :<, 10)
+   end
+ 
+   def test_interrupt
+-    assert(interrupt { (65536 ** 65536).to_s })
++    assert_interrupt {(65536 ** 65536).to_s}
+   end
+ 
+   def test_too_big_to_s
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-custom-rubygems-location.patch new file +86 -0

86 lines not on this page · raw message

meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-disable-versioned-paths.patch new file +149 -0

149 lines not on this page · raw message

meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-fix-s390x-build.patch new file +12 -0
new file mode 100644
index 0000000..d0ade91
@@ -0,0 +1,12 @@
+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)
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-install-cross.patch new file +16 -0
new file mode 100644
index 0000000..9515ece
@@ -0,0 +1,16 @@
+---
+ Makefile.in |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -210,7 +210,8 @@
+ 	@$(RM) fake.rb fake-rbconfig.rb
+ 	$(INSTALL_DATA) $(arch_hdrdir)/ruby/config.h $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
+ 	$(INSTALL_DATA) $(top_srcdir)/include/ruby/win32.h $(XRUBY_RUBYHDRDIR)/ruby
+-	$(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
++	$(INSTALL_DATA) $(LIBRUBY) $(XRUBY_RUBYLIBDIR)/$(arch)
++	$(INSTALL_DATA) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
+ 	$(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
+ 
+ Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-mkmf-verbose.patch new file +11 -0
new file mode 100644
index 0000000..7da66c8
@@ -0,0 +1,11 @@
+--- ruby-1.9.3-p0/lib/mkmf.rb.debug	2011-08-11 15:07:37.000000000 +0900
++++ ruby-1.9.3-p0/lib/mkmf.rb	2012-01-29 21:34:17.000000000 +0900
+@@ -1638,7 +1638,7 @@
+ SHELL = /bin/sh
+ 
+ # V=0 quiet, V=1 verbose.  other values don't work.
+-V = 0
++V = 1
+ Q1 = $(V:1=)
+ Q = $(Q1:0=@)
+ n=$(NULLCMD)
meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-rubygems-1.8.11-uninstaller.patch new file +76 -0

76 lines not on this page · raw message

meta-ruby/recipes-devtools/ruby/ruby/ruby-1.9.3-webrick-test-fix.patch new file +24 -0
new file mode 100644
index 0000000..c6eb3fa
@@ -0,0 +1,24 @@
+diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
+index 1185316..0ef1b37 100644
+--- a/test/webrick/test_cgi.rb
++++ b/test/webrick/test_cgi.rb
+@@ -14,6 +14,7 @@ class TestWEBrickCGI < Test::Unit::TestCase
+         def req.meta_vars
+           meta = super
+           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
++          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']]
+           return meta
+         end
+       },
+diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
+index bcdb3df..f78ba5c 100644
+--- a/test/webrick/test_filehandler.rb
++++ b/test/webrick/test_filehandler.rb
+@@ -252,6 +252,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
+         def req.meta_vars
+           meta = super
+           meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
++          meta[RbConfig::CONFIG['LIBPATHENV']] = ENV[RbConfig::CONFIG['LIBPATHENV']]
+           return meta
+         end
+       },
meta-ruby/recipes-devtools/ruby/ruby/rubygems-1.8.11-binary-extensions.patch new file +296 -0

296 lines not on this page · raw message

meta-ruby/recipes-devtools/ruby/ruby_1.8.7-p302.bb deleted +0 -12
deleted file mode 100644
index 299187c..0000000
@@ -1,12 +0,0 @@
-require ruby.inc
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch"
-
-SRC_URI[md5sum] = "f446550dfde0d8162a6ed8d5a38b3ac2"
-SRC_URI[sha256sum] = "5883df5204de70762602ce885b18c8bf6c856d33298c35df9151031b2ce044a1"
-
-FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
-                    ${libdir}/ruby/1.8/*/*/.debug"
-BBCLASSEXTEND = "native"
-
meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p194.bb new file +50 -0

50 lines not on this page · raw message

Signature · 1 line
1.8.1.4
Applied
#4 lore raw
In reply to Martin Jansa
Quoted 6 lines · Martin Jansa

I know that adding new layer is not typical "backport", but we need ruby in danny and IIRC Koen also needs.

Also because it's separate layer, there is no danger to users which don't need or use it.

Quoted 9 lines

The following changes since commit c02834a7cc5fda525c7ebeec545625233bab4cb5:

xf86-video-geode: Update to 2.11.14 (2013-02-15 12:16:55 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib jansa/for-danny3
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/for-danny3

pushed to danny-next.

Thanks
Eric

Applied
#5 lore raw
In reply to Martin Jansa

Hi Martin,

Quoted 6 lines · Martin Jansa

I know that adding new layer is not typical "backport", but we need ruby in danny and IIRC Koen also needs.

Also because it's separate layer, there is no danger to users which don't need or use it.

pushed to danny.

Eric