[DRE-commits] [ruby-inline] 01/05: Fix build on Ruby 2.0

[Christian Hofstaedtler]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-inline.

commit 9cc54c810dd1fe3039a9465f2284bcca1a9d0a14
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Wed Jan 15 18:21:23 2014 +0100

    Fix build on Ruby 2.0
---
 debian/patches/dont_require_rubygems |  4 ++--
 debian/patches/ruby2.0-multiarch     | 12 ++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/dont_require_rubygems b/debian/patches/dont_require_rubygems
index b89d7ce..af78916 100644
--- a/debian/patches/dont_require_rubygems
+++ b/debian/patches/dont_require_rubygems
@@ -53,7 +53,7 @@ Index: ruby-inline/lib/inline.rb
 +                when /^1\.8/
 +                  '1.8'
 +                else
-+                raise 'unsupported ruby version: ' + RUBY_VERSION
++                  RUBY_VERSION
 +                end
 +      version = "#{engine}-#{rubyver}"
  
@@ -77,7 +77,7 @@ Index: ruby-inline/test/test_inline.rb
 +              when /^1\.8/
 +                '1.8'
 +              else
-+                raise 'unsupported ruby version: ' + RUBY_VERSION
++                RUBY_VERSION
 +              end
 +    version = "#{engine}-#{rubyver}"
      inlinedir = File.join(@rootdir, ".ruby_inline", version)
diff --git a/debian/patches/ruby2.0-multiarch b/debian/patches/ruby2.0-multiarch
new file mode 100644
index 0000000..b3c8e5f
--- /dev/null
+++ b/debian/patches/ruby2.0-multiarch
@@ -0,0 +1,12 @@
+Index: ruby-inline/lib/inline.rb
+===================================================================
+--- ruby-inline.orig/lib/inline.rb	2014-01-15 18:19:01.959718169 +0100
++++ ruby-inline/lib/inline.rb	2014-01-15 18:19:11.483673062 +0100
+@@ -595,6 +595,7 @@ VALUE #{method}_equals(VALUE value) {
+                   (RbConfig::CONFIG['LDFLAGS']          if sane),
+                   '-I', hdrdir,
+                   config_hdrdir,
++                  (['-I', RbConfig::CONFIG['rubyarchhdrdir']] if RUBY_VERSION >= '2'),
+                   '-I', RbConfig::CONFIG['includedir'],
+                   ("-L#{RbConfig::CONFIG['libdir']}"    if sane),
+                   (['-o', so_name.inspect]              if sane),
diff --git a/debian/patches/series b/debian/patches/series
index 9ea5db2..33bf7d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 dont_require_rubygems
 fix_ruby_path
 inline_mapping_instead_of_zentest_mapping
+ruby2.0-multiarch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-inline.git