This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 6af7d2101a50dd3da5976980bdf5eab3fb00d6ed
Author: Alastair McKinstry <mckins...@debian.org>
Date: Wed Apr 13 00:04:16 2016 +0100
Add hdf5-library-path.patch back
---
debian/patches/hdf5_mpi_libs.patch | 69 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 8 ++---
3 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/debian/patches/hdf5_mpi_libs.patch
b/debian/patches/hdf5_mpi_libs.patch
new file mode 100644
index 0000000..ed5bb6a
--- /dev/null
+++ b/debian/patches/hdf5_mpi_libs.patch
@@ -0,0 +1,69 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ netcdf (1:4.4.0-2~exp1) UNRELEASED; urgency=medium
+ .
+ * Add mpi, pnetcdf variants of netcdf. Closes: #708638.
+ * use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
+ * Enable MMAP in diskless.
+Author: Alastair McKinstry <mckins...@debian.org>
+Bug-Debian: https://bugs.debian.org/708638
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: netcdf-4.4.0/CMakeLists.txt
+===================================================================
+--- netcdf-4.4.0.orig/CMakeLists.txt
++++ netcdf-4.4.0/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-## This is a CMake file, part of Unidata's netCDF package.
++# This is a CMake file, part of Unidata's netCDF package.
+ # Copyright 2012-2014, see the COPYRIGHT file for more information.
+ #
+
+@@ -495,6 +495,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
+ MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
+ MESSAGE(STATUS "Using HDF5 HL LIbrary: ${HDF5_HL_LIBRARY}")
++ SET(HDF5_LIBRARIES "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY}")
++ INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
+ ELSE(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) # We are
seeking out HDF5 with Find Package.
+ ###
+ # For now we assume that if we are building netcdf
+@@ -524,7 +526,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+ FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL
NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE})
+ ELSE(MSVC)
+- FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++ IF (HDF5_C_LIBRARY AND HDF5_HL_LIBRARY)
++ SET(ALL_TLL_LIBS "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY};${ALL_TLL_LIBS}")
++ ELSE()
++ # Only do this if not set, otherwise we only get serial versions, for
some reason
++ FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++ ENDIF()
+ ENDIF(MSVC)
+
+ ##
+@@ -1199,6 +1206,7 @@ CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCO
+ CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
+ CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
+
++
+ #####
+ # End system inspection checks.
+ #####
diff --git a/debian/patches/series b/debian/patches/series
index 39cb20c..29cfe5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,5 @@ hdf5-library-path.patch
attributes-typo.patch
m4-generated-sources.patch
hdf5-location.patch
+hdf5-library-path.patch
pnetcdf-settings.patch
diff --git a/debian/rules b/debian/rules
index f55528c..3ff527b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,8 @@ override_dh_auto_configure:
-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
+ -DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver
dh_auto_configure --builddirectory=build-pnetcdf -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -48,24 +50,20 @@ override_dh_auto_configure:
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_MMAP=ON \
- -DENABLE_PARALLEL4=ON \
- -DENABLE_NETCDF_4=ON \
-DUSE_SZIP=ON \
-DUSE_HDF5=ON \
-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
-DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
+ -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
-DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
- -DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc \
-DNETCDF_LIB_NAME=netcdf_mpi
-
-
override_dh_auto_build:
$(MAKE) -C build-serial
$(MAKE) -C build-pnetcdf
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/netcdf.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
