mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

ruby: Add from OE-Classic

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

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Jackie Huang
2012-10-16 08:34:41 +00:00
committed by Martin Jansa
parent a1e6087f09
commit d04b996ec2
5 changed files with 109 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-ruby/recipes-devtools/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+31
View File
@@ -0,0 +1,31 @@
From 9341293e71c03fe606edc9157bf1e13e3dd5b507 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
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 <koen@dominion.thruhere.net>
---
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
+13
View File
@@ -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
+15
View File
@@ -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)