This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.
commit 6bd25e2a3add1dcd7135b09182caa797e6816a1a
Author: Alastair McKinstry <mckins...@debian.org>
Date: Tue Jan 26 06:27:59 2016 +0000
Enable MMAP in diskless.
---
debian/changelog | 1 +
debian/libnetcdf-dev.install | 7 ++++---
debian/rules | 30 ++++++++++++++++++++----------
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcc0f16..f4b2c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ netcdf (1:4.4.0~rc5-1~exp2) 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.
-- Alastair McKinstry <mckins...@debian.org> Thu, 14 Jan 2016 16:56:32 +0000
diff --git a/debian/libnetcdf-dev.install b/debian/libnetcdf-dev.install
index 888bea7..f81a9be 100644
--- a/debian/libnetcdf-dev.install
+++ b/debian/libnetcdf-dev.install
@@ -1,7 +1,8 @@
usr/bin/nc-config
-usr/include/*
-usr/lib/*/netcdf/libnetcdf.so
-#usr/lib/*/netcdf/libnetcdf.a
+usr/include/netcdf.h
+usr/include/netcdf_meta.h
+usr/lib/*/libnetcdf.so
+#usr/lib/*/libnetcdf.a
usr/lib/*/netcdf/serial
usr/lib/*/cmake/netCDF
usr/lib/*/pkgconfig/netcdf-serial.pc
diff --git a/debian/rules b/debian/rules
index 5a2f403..da6d435 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,24 +26,34 @@ override_dh_auto_configure:
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
- -DUSE_PARALLEL=OFF \
- -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/serial \
- -DHDF5_LIBRARY_PATH=$(LIBDIR)/hdf5/serial \
+ -DENABLE_MMAP=ON \
+ -DUSE_SZIP=ON \
+ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
+ -DHDF5_LIB=$(LIBDIR)/hdf5/serial/libhdf5.so \
+ -DHDF5_HL_LIB=$(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 \
-DENABLE_TESTS:BOOL=ON \
+ -DENABLE_MMAP=ON \
+ -DUSE_SZIP=ON \
-DENABLE_DOXYGEN:BOOL=ON \
-DENABLE_PNETCDF=ON \
+ -DPNETCDF_INCLUDE_DIR=/usr/include \
-DCMAKE_C_COMPILER=mpicc
dh_auto_configure --builddirectory=build-mpi -- \
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DENABLE_PARALLEL_TESTS:BOOL=OFF \
-DENABLE_TESTS:BOOL=ON \
-DENABLE_DOXYGEN:BOOL=ON \
- -DUSE_PARALLEL=ON \
- -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
- -DHDF5_LIBRARY_PATH=$(LIBDIR)/hdf5/$(MPI) \
+ -DENABLE_MMAP=ON \
+ -DHDF5_IS_PARALLEL=ON \
+ -DENABLE_PARALLEL4=ON \
+ -DENABLE_NETCDF_4=ON \
+ -DUSE_SZIP=ON \
+ -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
+ -DHDF5_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+ -DHDF5_HL_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
-DCMAKE_C_COMPILER=mpicc
@@ -60,9 +70,7 @@ override_dh_auto_install:
# install all versions
for d in serial mpi pnetcdf ; do \
$(MAKE) -C build-$$d install DESTDIR=$(CURDIR)/debian/tmp-$$d ;
\
- mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake ; \
- sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
- > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
+ mkdir -p debian/tmp/$(LIBDIR)/netcdf/$$d/cmake
debian/tmp/$(LIBDIR)/cmake debian/tmp/$(LIBDIR)/pkgconfig ; \
cp debian/tmp-$$d/$(LIBDIR)/libnetcdf.settings
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.settings ; \
cp -a debian/tmp-$$d/$(LIBDIR)/cmake/netCDF
debian/tmp/$(LIBDIR)/cmake/netCDF_$$d ; \
ln -fs $(LIBDIR)/cmake/netCDF_$$d
debian/tmp/$(LIBDIR)/netcdf/$$d/cmake/netCDF ; \
@@ -71,6 +79,8 @@ override_dh_auto_install:
for d in mpi pnetcdf ; do \
sed -e 's%@MULTIARCH@%$(DEB_HOST_MULTIARCH)%' <
debian/libnetcdf-$$d-dev.postinst.in \
> debian/libnetcdf-$$d-dev.postinst ; \
+ sed -e 's/-lnetcdf/-lnetcdf_$$d/' <
debian/tmp-$$d/$(LIBDIR)/pkgconfig/netcdf.pc \
+ > debian/tmp/$(LIBDIR)/pkgconfig/netcdf-$$d.pc ; \
mv debian/tmp-$$d/$(LIBDIR)/libnetcdf.so.7.3.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.7.3.0 ; \
ln -sf $(LIBDIR)/libnetcdf_$$d.so.7.3.0
debian/tmp/$(LIBDIR)/netcdf/$$d/libnetcdf.so ; \
ln -sf libnetcdf_$$d.so.7.3.0
debian/tmp/$(LIBDIR)/libnetcdf_$$d.so.7; \
@@ -79,7 +89,7 @@ override_dh_auto_install:
dh_link -p libnetcdf-$$d-dev /usr/include
$(LIBDIR)/netcdf/$$d/include ; \
done
# Serial; one-off only
- mkdir -p debian/tmp/$(LIBDIR)/pkgconfig debian/tmp/$(LIBDIR)/cmake
+ cp -a debian/tmp-serial/$(LIBDIR)/pkgconfig/netcdf.pc
debian/tmp/$(LIBDIR)/pkgconfig/netcdf-serial.pc
cp -a debian/tmp-serial/$(LIBDIR)/cmake/netCDF
debian/tmp/$(LIBDIR)/cmake/netCDF
cp -a debian/tmp-pnetcdf/usr/include debian/tmp/usr
cp -a debian/tmp-serial/usr/share debian/tmp/usr
--
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
