[DebianGIS-dev] r2819 - packages/netcdf/branches/4.1/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-04-12 10:51:19 +0000 (Mon, 12 Apr 2010)
New Revision: 2819

Modified:
   packages/netcdf/branches/4.1/debian/changelog
   packages/netcdf/branches/4.1/debian/rules
Log:
Fixing 4.1.1 in experimental.


Modified: packages/netcdf/branches/4.1/debian/changelog
===================================================================
--- packages/netcdf/branches/4.1/debian/changelog	2010-04-09 10:21:03 UTC (rev 2818)
+++ packages/netcdf/branches/4.1/debian/changelog	2010-04-12 10:51:19 UTC (rev 2819)
@@ -1,3 +1,10 @@
+netcdf (1:4.1.1-2) experimental; urgency=low
+
+  * Added an explicit linking to HDF5 and libz to avoid undefs at linking time. 
+    This is a problem in final 4.1.1 that needs a better solution.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 12 Apr 2010 12:49:44 +0200
+
 netcdf (1:4.1.1-1) experimental; urgency=low
 
   * New upstream release with various building fix merged. Thanks Ed

Modified: packages/netcdf/branches/4.1/debian/rules
===================================================================
--- packages/netcdf/branches/4.1/debian/rules	2010-04-09 10:21:03 UTC (rev 2818)
+++ packages/netcdf/branches/4.1/debian/rules	2010-04-12 10:51:19 UTC (rev 2819)
@@ -10,11 +10,14 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+# In 4.1.1 forces HDF5 linking
+LIBS="-L/usr/lib -lhdf5_hl -lhdf5 -lz -lm"
+
 # Add here any variable or target overrides you need.
 
 # Note that hdf5 dir has to be specified due to a bug into fortran/Makefile.am which causes
 # skipping of fort-nc4.c without that.
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf --enable-dap
+DEB_CONFIGURE_EXTRA_FLAGS := LIBS=$(LIBS) --enable-shared --enable-pic --enable-docs-install --enable-netcdf-4  --with-hdf5=/usr --with-libcf --enable-dap 
 DEB_CONFIGURE_SCRIPT_ENV += FC="gfortran"
 DEB_CONFIGURE_SCRIPT_ENV += CXX="g++"
 DEB_CONFIGURE_SCRIPT_ENV += CC="gcc"