tags 756647 + pending
thanks

Dear maintainer,

I've prepared an NMU for adios (versioned as 1.7.0-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

_g.

diff -Nru adios-1.7.0/debian/changelog adios-1.7.0/debian/changelog
--- adios-1.7.0/debian/changelog        2014-06-17 17:32:39.000000000 +0200
+++ adios-1.7.0/debian/changelog        2014-08-06 19:18:15.000000000 +0200
@@ -1,3 +1,10 @@
+adios (1.7.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout (closes: #756647).
+
+ -- Gilles Filippini <[email protected]>  Wed, 06 Aug 2014 19:17:45 +0200
+
 adios (1.7.0-2) unstable; urgency=medium
 
   * PATH not inherited correctly. export it.
diff -Nru adios-1.7.0/debian/rules adios-1.7.0/debian/rules
--- adios-1.7.0/debian/rules    2014-06-17 17:32:39.000000000 +0200
+++ adios-1.7.0/debian/rules    2014-08-06 19:17:40.000000000 +0200
@@ -48,6 +48,11 @@
 ifeq ($(ARCH),kfreebsd-i386)
   WITH_IBVERBS:=
 endif
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  WITH_HDF5:=--with-hdf5=/usr
+endif
 
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
@@ -74,7 +79,7 @@
 
 override_dh_auto_configure:
        dh_auto_configure --  $(WITH_LUSTRE) $(WITH_IBVERBS) --enable-shared \
-               --with-hdf5=/usr --with-bzip2=/usr  --with-zlib=/usr \
+               $(WITH_HDF5) --with-bzip2=/usr  --with-zlib=/usr \
                --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) # CFLAGS='-fPIC'
 
 override_dh_auto_build:


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to