[DRE-commits] [ruby-grib] 04/07: Add patch: Search NArray from vendorarchdir

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-grib.

commit f836e96ce4d14ff7a5a3f28c1ede9109e0e8a7d0
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Jun 20 21:53:28 2016 +0900

    Add patch: Search NArray from vendorarchdir
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0002-Fix-NArray-PATH.patch | 41 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/0002-Fix-NArray-PATH.patch b/debian/patches/0002-Fix-NArray-PATH.patch
new file mode 100644
index 0000000..9cee93d
--- /dev/null
+++ b/debian/patches/0002-Fix-NArray-PATH.patch
@@ -0,0 +1,41 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 20 Jun 2016 21:53:37 +0900
+Subject: Fix NArray PATH: search NArray from vendorarchdir
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ ext/extconf.rb | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index e8d9ee2..5845ed5 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -1,24 +1,6 @@
+ require "mkmf"
+-
+-begin
+-  require "rubygems"
+-  if Gem::Specification.respond_to?(:find_by_name)
+-    if spec = ( Gem::Specification.find_by_name("numru-narray") || Gem::Specification.find_by_name("narray") )
+-      gem_path = spec.full_gem_path
+-    end
+-  else
+-    if (spec = (Gem.source_index.find_name("numru-narray") || Gem.source_index.find_name("narray")) ).any?
+-      gem_path = spec.full_gem_path
+-    end
+-  end
+-  gem_path = File.join(gem_path, "ext", "numru", "narray")
+-rescue LoadError
+-  dir_config("narray", RbConfig::CONFIG["sitearchdir"])
+-end
+-
+-unless find_header("narray.h", gem_path)
+-  find_header("narray.h", File.join(gem_path,"src"))
+-end
++dir_config("narray", RbConfig::CONFIG["vendorarchdir"])
++find_header("narray.h", RbConfig::CONFIG["vendorarchdir"])
+ 
+ dir_config("grib_api")
+ if have_header("grib_api.h") && have_library("grib_api")
diff --git a/debian/patches/series b/debian/patches/series
index de3ce59..3f30c73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-RSpec-LOAD_PATH.patch
+0002-Fix-NArray-PATH.patch

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