[DRE-commits] [ruby-mkrf] 05/06: Add patch for multiarch header dirs (new in 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-mkrf.

commit 4b327b5af286943d71a9b48723ff9f37b0e2ee06
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Dec 24 00:47:52 2013 +0100

    Add patch for multiarch header dirs (new in Ruby 2.0)
---
 debian/patches/0900_multiarch.patch | 49 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 50 insertions(+)

diff --git a/debian/patches/0900_multiarch.patch b/debian/patches/0900_multiarch.patch
new file mode 100644
index 0000000..7522789
--- /dev/null
+++ b/debian/patches/0900_multiarch.patch
@@ -0,0 +1,49 @@
+Index: ruby-mkrf/lib/mkrf/availability.rb
+===================================================================
+--- ruby-mkrf.orig/lib/mkrf/availability.rb	2013-12-24 00:39:20.045251620 +0100
++++ ruby-mkrf/lib/mkrf/availability.rb	2013-12-24 00:39:20.041251633 +0100
+@@ -9,15 +9,15 @@ module Mkrf
+   # which need to determine functionality based on what libraries are available
+   # on the current system.
+   class Availability
+-    # ruby 1.9+
+-    if RbConfig::CONFIG['rubyhdrdir']
+-      DEFAULT_INCLUDES = [RbConfig::CONFIG['rubyhdrdir'],
++    # ruby 2.0+
++    if RbConfig::CONFIG['rubyarchhdrdir']
++      DEFAULT_INCLUDES = [RbConfig::CONFIG['rubyarchhdrdir'],RbConfig::CONFIG['rubyhdrdir'],
+                           RbConfig::CONFIG['rubyhdrdir'] + "/" + RbConfig::CONFIG['arch'],
+                           RbConfig::CONFIG["archdir"],RbConfig::CONFIG['sitelibdir'], "."]
+-
+     else
+-      DEFAULT_INCLUDES = [RbConfig::CONFIG['includedir'], RbConfig::CONFIG["archdir"],
+-                          RbConfig::CONFIG['sitelibdir'], "."]
++      DEFAULT_INCLUDES = [RbConfig::CONFIG['rubyhdrdir'],
++                          RbConfig::CONFIG['rubyhdrdir'] + "/" + RbConfig::CONFIG['arch'],
++                          RbConfig::CONFIG["archdir"],RbConfig::CONFIG['sitelibdir'], "."]
+     end
+                         
+     # These really shouldn't be static like this..
+Index: ruby-mkrf/test/unit/test_availability.rb
+===================================================================
+--- ruby-mkrf.orig/test/unit/test_availability.rb	2013-12-24 00:39:19.817252417 +0100
++++ ruby-mkrf/test/unit/test_availability.rb	2013-12-24 00:40:20.193079805 +0100
+@@ -137,13 +137,14 @@ class TestAvailabilityDefaults < Test::U
+   
+   def test_default_include_dir_should_be_from_rbconfig
+     #Fix to correspond to the definition in lib/mkrf/availability.rb (Debian patch)
+-    if Config::CONFIG['rubyhdrdir']
+-      expected = [Config::CONFIG['rubyhdrdir'],
++    if Config::CONFIG['rubyarchhdrdir']
++      expected = [Config::CONFIG['rubyarchhdrdir'],Config::CONFIG['rubyhdrdir'],
+                 Config::CONFIG['rubyhdrdir'] + "/" + Config::CONFIG['arch'],
+                 Config::CONFIG["archdir"],Config::CONFIG['sitelibdir'], "."]
+     else
+-      expected = [Config::CONFIG['includedir'], Config::CONFIG["archdir"],
+-                Config::CONFIG['sitelibdir'], "."]
++      expected = [Config::CONFIG['rubyhdrdir'],
++                Config::CONFIG['rubyhdrdir'] + "/" + Config::CONFIG['arch'],
++                Config::CONFIG["archdir"],Config::CONFIG['sitelibdir'], "."]
+     end
+ 
+     assert_equal expected, @avail.send(:instance_variable_get, :@includes)
diff --git a/debian/patches/series b/debian/patches/series
index 9b638f1..43e3fe8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 0700_fix_link_command_order.patch
 9900_debug_test_failures.patch
 0800_remove_rcov.patch
+0900_multiarch.patch

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