[ruby-hdfeos5] 01/04: Set HDFEOS5 lib,inc dir explicitly

Youhei SASAKI uwabami-guest at moszumanska.debian.org
Fri Sep 4 05:59:11 UTC 2015


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 5fd51f75849ba8f78e6e54f7b8018f1d75520c5a
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Sep 4 14:46:54 2015 +0900

    Set HDFEOS5 lib,inc dir explicitly
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0004-hdf5-dir.patch | 52 ++++++++++++++++++++++++++++++++++----
 debian/rules                       |  8 ++++++
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0004-hdf5-dir.patch b/debian/patches/0004-hdf5-dir.patch
index 4c989b4..e7aba45 100644
--- a/debian/patches/0004-hdf5-dir.patch
+++ b/debian/patches/0004-hdf5-dir.patch
@@ -1,10 +1,52 @@
-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 @@
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -1,4 +1,7 @@
  require "mkmf"
 +$configure_args["--with-hdf5-dir"] = ENV["HDF5_DIR"]
++$configure_args["--with-hdfeos5-lib"] = ENV["HE5_HDF_LIBDIR"]
++$configure_args["--with-hdfeos5-include"] = ENV["HE5_HDF_INCDIR"]
  
  require "rbconfig" unless defined? RbConfig
  $vendorarchdir=RbConfig::CONFIG['vendorarchdir']
+@@ -8,8 +11,8 @@
+ 
+ if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
+ print <<EOS
+-** configure error **  
+-   Header narray.h or narray_config.h is not found. If you have these files in 
++** configure error **
++   Header narray.h or narray_config.h is not found. If you have these files in
+    /narraydir/include, try the following:
+ 
+    % ruby extconf.rb --with-narray-include=/narraydir/include
+@@ -30,8 +33,8 @@
+ 
+ if ( ! ( have_header("hdf5.h") && have_library("hdf5")  ) )then
+   print <<-EOS
+-    ** configure error **  
+-       Header hdf.h or the compiled hdf5 library is not found. 
++    ** configure error **
++       Header hdf.h or the compiled hdf5 library is not found.
+        If you have the library installed under /hdf5dir (that is, hdf5.h is
+        in /hdf5dir/include and the library in /hdf5dir/lib/),
+        try the following:
+@@ -48,8 +51,8 @@
+ 
+ if ( ! ( have_header("HE5_HdfEosDef.h") && have_library("he5_hdfeos")  ) )then
+   print <<-EOS
+-    ** configure error **  
+-       Header hdfeos5.h or the compiled hdfeos5 library is not found. 
++    ** configure error **
++       Header hdfeos5.h or the compiled hdfeos5 library is not found.
+        If you have the library installed under /hdfeos5dir (that is, hdfeos5.h is
+        in /hdfeos5dir/include and the library in /hdfeos5dir/lib/),
+        try the following:
+@@ -79,7 +82,7 @@
+       newmkfl.puts("\t\t@$(RM) *.he5  Makefile.orig")
+    when /^all:/
+       newmkfl.puts(line)
+-      newmkfl.puts("")         
++      newmkfl.puts("")
+       newmkfl.puts("test: all")            # insert the "test" target
+       newmkfl.puts("\t\t at cd test && ruby test.rb && echo 'test did not fail :-p (please ignore the warnings)' && cd ..")
+    else
diff --git a/debian/rules b/debian/rules
index fa1149a..8d88d54 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,15 @@ else
   export HDF5_DIR := /usr
 endif
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/libhe5_hdfeos.so),)
+  export HE5_HDF_LIBDIR := /usr/lib/$(DEB_HOST_MULTIARCH)/
+else
+  export HE5_HDF_LIBDIR := /usr
+endif
+export HE5_HDF_INCDIR := /usr/include/hdf-eos5
+
 %:
+	@echo $(HDF5_DIR)
 	dh $@ --with ruby --buildsystem ruby
 
 override_dh_strip:

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



More information about the Pkg-grass-devel mailing list