[xdmf] 07/38: Patch to link against gzstream lib

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit c345c3fd46636475d64feb16bc5a63fa70c24331
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Apr 1 15:37:13 2016 +0100

    Patch to link against gzstream lib
---
 debian/patches/gzstream.patch | 27 ++++++++++++++++++++++++---
 debian/rules                  |  3 ++-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/debian/patches/gzstream.patch b/debian/patches/gzstream.patch
index 96a8c8a..f088456 100644
--- a/debian/patches/gzstream.patch
+++ b/debian/patches/gzstream.patch
@@ -3,10 +3,10 @@ Description: Delete (refs) to local gsztream, as we use libgzstream-dev on Debia
 Forwarded: not-needed
 Last-Updated: 2016-04-01
 
-Index: xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+Index: xdmf.git/libsrc/CMakeLists.txt
 ===================================================================
---- xdmf-2.1.dfsg.1.orig/libsrc/CMakeLists.txt
-+++ xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+--- xdmf.git.orig/libsrc/CMakeLists.txt
++++ xdmf.git/libsrc/CMakeLists.txt
 @@ -115,7 +115,6 @@ SET(CSHARP_SOURCES
  	)
  
@@ -15,3 +15,24 @@ Index: xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
     )
  
  IF(XDMF_BUILD_VTK)
+@@ -437,6 +436,7 @@ TARGET_LINK_LIBRARIES(Xdmf
+   ${XDMF_MPI_LIBRARIES} 
+   ${LIBXML2_LIBRARY} 
+   ${XDMF_ZLIB_LIBRARIES}
++  ${GZSTREAM_LIBRARY}
+   ${XDMF_BZIP2_LIBRARIES})
+ 
+ OPTION(XDMF_WRAP_PYTHON "Build a Python wrapping interface" OFF)
+Index: xdmf.git/libsrc/XdmfValuesBinary.cxx
+===================================================================
+--- xdmf.git.orig/libsrc/XdmfValuesBinary.cxx
++++ xdmf.git/libsrc/XdmfValuesBinary.cxx
+@@ -29,7 +29,7 @@
+ #include <exception>
+ #include <cassert>
+ #ifdef XDMF_USE_GZIP
+-#include "gzstream.h"
++#include <gzstream.h>
+ #endif
+ 
+ #ifdef XDMF_USE_BZIP2
diff --git a/debian/rules b/debian/rules
index 6f2eaef..6ac930b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,8 @@ override_dh_auto_configure:
  		-DPYTHON_INCLUDE_PATH="/usr/include/${PYVER}" \
 		-DPYTHON_LIBRARY=${PYTHON_LIB} \
 		-DHDF5_INCLUDE_PATH=$(HDF5_INC) \
-		-DHDF5_LIBRARY=$(HDF5_LIB)
+		-DHDF5_LIBRARY=$(HDF5_LIB) \
+		-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so
 
 # -DXDMF_SYSTEM_HDF5=ON -DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xdmf.git