Source: adios
Version: 1.7.0-2
Severity: important
Tags: patch
User: [email protected]
Usertags: HDF5-transition

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

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.

Because this bug is in the way of the hdf5 transition I intend to NMU
in a few days. I apologize for the urge, and I hope this approach won't
offend you. Please tell me otherwise.

Kind regards,

_g.

- -- System Information:
Debian Release: jessie/sid
  APT prefers testing
  APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBCAAGBQJT2otNAAoJEO/obGx//s+DyMsH/A1lYmiuoxsVSiFOiSejWhU2
Otsy6i5EXMzGRZEQSyNWOsCSE6sdWGVPZQT0aqPBRiaYWS/cip5cR/dWn4wcbu2I
thQVlPmdabqUtcvOs5QYjuMy2V9igDtsOHzzqKLlLROmolqnuoNSVrPHP/9G/6wI
a5T3pi7cEDlFUk2TjJTq0A0Ga+X/Fo3gYuQN6irv76wQeQx7iFkfNwSDh6zYaZbL
vntwyfNQq/BvHgfzMXfkHu78AfFPIYJffTueaB438st4+OTxKMEc8y1zfgl9w/Q3
ruXAOjS8PMNY8NInUa7e9scbUGFvrYUKQHS7Ngr2k/r3gOJDVw95RY9XTgre3Nc=
=HONl
-----END PGP SIGNATURE-----
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-07-24 13:17:00.000000000 +0200
@@ -1,3 +1,10 @@
+adios (1.7.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout
+
+ -- Gilles Filippini <[email protected]>  Thu, 24 Jul 2014 13:16:55 +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-07-31 09:08:20.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:

Reply via email to