[Pkg-octave-commit] [octave] 05/05: Support hdf5 1.8.13 new packaging layout.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit bbe9c8656e0691a89978ef41ac6ef1b4e5f70134
Author: Gilles Filippini <pini at debian.org>
Date:   Thu Aug 14 12:10:05 2014 +0200

    Support hdf5 1.8.13 new packaging layout.
    
    New patches:
     - hdf5-flags.patch to fix a couple of makefiles regarding
       new paths;
     - hdf5-mkoctfile.patch to fix hdf5 path when building octave
       modules.
    
    Closes: #756689
    Git-Dch: Full
---
 debian/patches/hdf5-flags.patch     | 28 ++++++++++++++++++++++++++++
 debian/patches/hdf5-mkoctfile.patch | 19 +++++++++++++++++++
 debian/patches/series               |  2 ++
 debian/rules                        |  8 +++++++-
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/debian/patches/hdf5-flags.patch b/debian/patches/hdf5-flags.patch
new file mode 100644
index 0000000..b23ccc0
--- /dev/null
+++ b/debian/patches/hdf5-flags.patch
@@ -0,0 +1,28 @@
+Description: Propagate HDF5 flags to various places
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756689
+Forwarded: no
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2014-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libgui/src/module.mk
++++ b/libgui/src/module.mk
+@@ -172,6 +172,7 @@ src_libgui_src_la_CPPFLAGS = \
+   $(AM_CPPFLAGS) \
+   @OCTGUI_DLL_DEFS@ \
+   @QT_CPPFLAGS@ \
++  @HDF5_CPPFLAGS@ \
+   -I$(srcdir)/qterminal/libqterminal \
+   -Isrc -I$(srcdir)/src \
+   -I$(srcdir)/src/m-editor \
+--- a/libinterp/Makefile.am
++++ b/libinterp/Makefile.am
+@@ -22,6 +22,7 @@ include $(top_srcdir)/build-aux/common.m
+ 
+ ## Search local directories before those specified by the user.
+ AM_CPPFLAGS = \
++  @HDF5_CPPFLAGS@ \
+   -I$(top_srcdir)/liboctave/cruft/misc \
+   -I$(top_srcdir)/liboctave/array \
+   -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \
diff --git a/debian/patches/hdf5-mkoctfile.patch b/debian/patches/hdf5-mkoctfile.patch
new file mode 100644
index 0000000..08ce1c0
--- /dev/null
+++ b/debian/patches/hdf5-mkoctfile.patch
@@ -0,0 +1,19 @@
+Description: Add hdf5 path to INCFLAGS in mkoctfile
+ So that packages build-depending on liboctave-dev don't have to care.
+Author: Gilles Filippini <pini at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756689
+Forwarded: no
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2014-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/mkoctfile.in.cc
++++ b/src/mkoctfile.in.cc
+@@ -139,6 +139,7 @@ initialize (void)
+     = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
+       + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
+ #endif
++  DEFAULT_INCFLAGS += std::string(" ") + %OCTAVE_CONF_HDF5_CPPFLAGS%;
+   if (vars["INCLUDEDIR"] != "/usr/include")
+     DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1dc08a9..73b2a42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ mkoctfile-mpi.diff
 dblquad-s390x.diff
 hurd_path_max.diff
 always-build-octave-jar.patch
+hdf5-flags.patch
+hdf5-mkoctfile.patch
diff --git a/debian/rules b/debian/rules
index 422d3f8..c27f42b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,12 @@ endif
 # libraries, for example the mesa graphics stack which also uses LLVM.
 JIT_FLAG := --disable-jit
 
+# HDF5 paths
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  HDF5_FLAGS := --with-hdf5-includedir=/usr/include/hdf5/serial \
+	--with-hdf5-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 %:
 	dh $@ --with autoreconf --parallel
 
@@ -44,7 +50,7 @@ clean:
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG)
+	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG) $(HDF5_FLAGS)
 
 # dh_auto_test tries to run "make test", so override it
 override_dh_auto_test:

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git