summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2010-02-15 09:45:58 +0000
committerJesse Gilles <jgilles@multitech.com>2010-04-26 11:36:42 -0500
commitff687ac1add9ade01746103dc34f5b27197c04c2 (patch)
tree45939a942d77a2f45f384de7b752cc049e6febb8
parent6bb1ee1afd4976f85f5ecab866855b7d13820570 (diff)
ruby_1.8.7-p248.bb: fix ext/dl compile
* Update ruby library path so extensions needing mkmf can build and find the right ruby headers. Fixes building of ext/dl. Signed-off-by: Jesse Gilles <jgilles@multitech.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/ruby/files/extmk.patch13
-rw-r--r--recipes/ruby/ruby_1.8.7-p248.bb1
2 files changed, 14 insertions, 0 deletions
diff --git a/recipes/ruby/files/extmk.patch b/recipes/ruby/files/extmk.patch
new file mode 100644
index 0000000000..8b68450341
--- /dev/null
+++ b/recipes/ruby/files/extmk.patch
@@ -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"] = "-"
diff --git a/recipes/ruby/ruby_1.8.7-p248.bb b/recipes/ruby/ruby_1.8.7-p248.bb
index 8d953736fd..827327b3d8 100644
--- a/recipes/ruby/ruby_1.8.7-p248.bb
+++ b/recipes/ruby/ruby_1.8.7-p248.bb
@@ -2,6 +2,7 @@ require ruby.inc
DEPENDS = "ruby-native zlib openssl"
SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
file://extmk_run.patch;patch=1 \
+ file://extmk.patch;patch=1 \
"
FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
${libdir}/ruby/1.8/*/*/.debug"