[ruby-hdfeos5] 01/01: Support newer hdf5 package layouts (Closes: #756696)

[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-hdfeos5.

commit 5f1acb181620ab39128dfbc9ada4e35415939c10
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Aug 1 10:55:45 2014 +0900

    Support newer hdf5 package layouts (Closes: #756696)
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0004-hdf5-dir.patch | 10 ++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/debian/patches/0004-hdf5-dir.patch b/debian/patches/0004-hdf5-dir.patch
new file mode 100644
index 0000000..4c989b4
--- /dev/null
+++ b/debian/patches/0004-hdf5-dir.patch
@@ -0,0 +1,10 @@
+Index: ruby-hdfeos5-1.2/extconf.rb
+===================================================================
+--- ruby-hdfeos5-1.2.orig/extconf.rb	2014-07-26 18:17:18.871956985 +0200
++++ ruby-hdfeos5-1.2/extconf.rb	2014-07-26 18:17:45.180828598 +0200
+@@ -1,4 +1,5 @@
+ require "mkmf"
++$configure_args["--with-hdf5-dir"] = ENV["HDF5_DIR"]
+ 
+ require "rbconfig" unless defined? RbConfig
+ $vendorarchdir=RbConfig::CONFIG['vendorarchdir']
diff --git a/debian/patches/series b/debian/patches/series
index 6c5aa0b..829d4ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-NArray-Library-Path.patch
 0002-Fix-test-data-path.patch
 0003-Fix-printf-debugging.patch
+0004-hdf5-dir.patch
diff --git a/debian/rules b/debian/rules
index 730e55e..fa1149a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  export HDF5_DIR := /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  export HDF5_DIR := /usr
+endif
+
 %:
 	dh $@ --with ruby --buildsystem ruby
 

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