This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf.
commit c515c7d75e3994d0d3587f45774665f590a32417 Author: Alastair McKinstry <mckins...@debian.org> Date: Mon Feb 22 02:16:49 2016 +0000 CMakeList Fixes --- debian/patches/hdf5-library-path.patch | 2 +- debian/patches/hdf5-location.patch | 10 +++++++--- debian/patches/pnetcdf-settings.patch | 12 ++++++++++++ debian/patches/series | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch index 3633778..c91723d 100644 --- a/debian/patches/hdf5-library-path.patch +++ b/debian/patches/hdf5-library-path.patch @@ -20,7 +20,7 @@ Forwarded: not-needed + +IF(USE_HDF5 AND DEFINED HDF5_INCLUDE_PATH) + SET(HDF5_INCS "-I${HDF5_INCLUDE_PATH}") -+ENDIF(USE_HDF5 AND DEFINED HDF5_LIBRARY_PATH) ++ENDIF(USE_HDF5 AND DEFINED HDF5_INCLUDE_PATH) + # Process all dependency libraries and create a string # used when parsing netcdf.pc.in diff --git a/debian/patches/hdf5-location.patch b/debian/patches/hdf5-location.patch index e3d4bd0..f387afa 100644 --- a/debian/patches/hdf5-location.patch +++ b/debian/patches/hdf5-location.patch @@ -2,14 +2,18 @@ Index: netcdf-4.4.0/CMakeLists.txt =================================================================== --- netcdf-4.4.0.orig/CMakeLists.txt +++ netcdf-4.4.0/CMakeLists.txt -@@ -596,8 +596,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -596,8 +596,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) # Find out if HDF5 was built with parallel support. # Do that by checking for the targets H5Pget_fapl_mpiposx and # H5Pget_fapl_mpio in ${HDF5_LIB}. - CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) - CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) -+ CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpiposix ${HDF5_C_LIBRARY} HDF5_IS_PARALLEL_MPIPOSIX) -+ CHECK_LIBRARY_EXISTS(hdf5 H5Pget_fapl_mpio ${HDF5_C_LIBRARY} HDF5_IS_PARALLEL_MPIO) ++ SET(H5C_LIB hdf5) ++ IF (HDF5_C_LIBRARY) ++ SET(H5C_LIB ${HDF5_C_LIBRARY}) ++ ENDIF() ++ CHECK_LIBRARY_EXISTS(${H5C_LIB} H5Pget_fapl_mpiposix "" HDF5_IS_PARALLEL_MPIPOSIX) ++ CHECK_LIBRARY_EXISTS(${H5C_LIB} H5Pget_fapl_mpio "" HDF5_IS_PARALLEL_MPIO) IF(HDF5_IS_PARALLEL_MPIPOSIX OR HDF5_IS_PARALLEL_MPIO) SET(HDF5_PARALLEL ON) ELSE() diff --git a/debian/patches/pnetcdf-settings.patch b/debian/patches/pnetcdf-settings.patch new file mode 100644 index 0000000..4ec4c67 --- /dev/null +++ b/debian/patches/pnetcdf-settings.patch @@ -0,0 +1,12 @@ +Index: netcdf-4.4.0/CMakeLists.txt +=================================================================== +--- netcdf-4.4.0.orig/CMakeLists.txt ++++ netcdf-4.4.0/CMakeLists.txt +@@ -948,6 +948,7 @@ IF(ENABLE_PNETCDF) + MESSAGE(STATUS "Cannot find pNetCDF library. Disabling pNetCDF support.") + SET(USE_PNETCDF OFF CACHE BOOL "") + ELSE(NOT PNETCDF) ++ SET(STATUS_PNETCDF "ON") + SET(USE_PARALLEL ON CACHE BOOL "") + ENDIF(NOT PNETCDF) + # ELSE() diff --git a/debian/patches/series b/debian/patches/series index 86e4aba..39cb20c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ hdf5-library-path.patch attributes-typo.patch m4-generated-sources.patch hdf5-location.patch +pnetcdf-settings.patch -- 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