Gilles Filippini a écrit , Le 01/08/2014 00:41: > Source: ncl > Version: 6.1.2-7 > Severity: important > Tags: patch > User: [email protected] > Usertags: HDF5-transition > > Hi, > > The hdf5 1.8.13 package in experimental features a new layout for > headers and libraries, so that all the binary packages are now > co-installable. > > Please find attached a patch proposal to support both the current > and the new layouts.
Patch adapted to the last upload (6.2.0-2). Thanks, _g.
diff -Nru ncl-6.2.0/debian/changelog ncl-6.2.0/debian/changelog --- ncl-6.2.0/debian/changelog 2014-07-28 22:07:33.000000000 +0200 +++ ncl-6.2.0/debian/changelog 2014-08-03 13:31:06.000000000 +0200 @@ -1,3 +1,10 @@ +ncl (6.2.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Support hdf5 1.8.13 new packaging layout (closes: #756686). + + -- Gilles Filippini <[email protected]> Fri, 25 Jul 2014 14:25:14 +0200 + ncl (6.2.0-2) unstable; urgency=medium * libproj-dev now needed explicitly. diff -Nru ncl-6.2.0/debian/LINUX.DEBIAN ncl-6.2.0/debian/LINUX.DEBIAN --- ncl-6.2.0/debian/LINUX.DEBIAN 2014-07-28 22:07:33.000000000 +0200 +++ ncl-6.2.0/debian/LINUX.DEBIAN 2014-08-03 13:29:51.000000000 +0200 @@ -23,8 +23,12 @@ #define HDFlib -lmfhdfalt -ldfalt -ljpeg -lz #define HDFEOSlib -lhdfeos -lgctp #define HDFEOS5lib -lhe5_hdfeos -lgctp -#define HDF5lib -lhdf5_hl -lhdf5 -lz -#define NetCDF4lib -lhdf5_hl -lhdf5 +/* + * $(HDF5_LDFLAGS) must not be substitued before built time because + * of buggy ymake who replaces $arch and $system with "1" + */ +#define HDF5lib $(HDF5_LDFLAGS) -lhdf5_hl -lhdf5 -lz +#define NetCDF4lib $(HDF5_LDFLAGS) -lhdf5_hl -lhdf5 #define GDALlib -lgdal #define NoMakeDepend diff -Nru ncl-6.2.0/debian/rules ncl-6.2.0/debian/rules --- ncl-6.2.0/debian/rules 2014-07-28 22:07:33.000000000 +0200 +++ ncl-6.2.0/debian/rules 2014-08-03 13:29:51.000000000 +0200 @@ -21,6 +21,11 @@ FC := gfortran VERSION := 6.1.2 +ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),) + CFLAGS += -I/usr/include/hdf5/serial + export HDF5_LDFLAGS := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial +endif + export LD_LIBRARY_PATH=$(TOPDIR)/shared:$(LIBDIR)/libfakeroot # We built it twice: first shared, to get the shared libraries (with -fpic -fPIC) @@ -46,7 +51,7 @@ sed -e 's/@CC@/${CC}/' \ -e 's/@FC@/${FC}/' \ -e 's/@LD@/${CC}/' \ - -e 's/@CFLAGS@/${CFLAGS}/' \ + -e 's:@CFLAGS@:${CFLAGS}:' \ -e 's/@FFLAGS@/${FFLAGS}/' \ -e 's/@CPPFLAGS@/${CPPFLAGS}/' \ -e 's/@LDFLAGS@/${LDFLAGS}/' \ @@ -55,7 +60,7 @@ sed -e 's/@CC@/${CC}/' \ -e 's/@FC@/${FC}/' \ -e 's/@LD@/${CC}/' \ - -e 's/@CFLAGS@/${CFLAGS}/' \ + -e 's:@CFLAGS@:${CFLAGS}:' \ -e 's/@FFLAGS@/${FFLAGS}/' \ -e 's/@CPPFLAGS@/${CPPFLAGS}/' \ -e 's/@LDFLAGS@/${LDFLAGS}/' \
signature.asc
Description: OpenPGP digital signature
