Source: adios Version: 1.9.0-12 Severity: important Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Hi, Please find attached a patch to support building against HDF5-1.10 currently in experimental. I intend to request a transition slot this week, and will NMU if need be. Thanks, _g. - -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.6.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -----BEGIN PGP SIGNATURE----- iQEcBAEBCAAGBQJYDnG6AAoJEO/obGx//s+D7aAIAKHKt9m2cb5EzrKApUBWGBty qL0117O2FcXZfseegg1khAjY7nNi2mweuhk2RdI0JipQ/4mOoza9u+ZGUNN1bYYA V5DdOadsU8DlbnO41xnebs2D1rTrUT23Mbt8N5NKnWdpxMrXesHL8gw3HdHn44b3 NvB9hniFTKVWuSP50TcFLGkFUaEAIIa5QTIVRSWM9oGLJ7aYqC8JJ5CM/TlvZPVL oqJ4/4+969CxQ/snj1Zrnl5kLVA6b8U2mjqt76iM97IzbQ9n0W8d+KpcYxC5vCrI mJ1mUuf1JIXRtNmE5Pz+F4FAqJiiQfQoLDVNGV1Mh92fylMJovEhGGVNK4XnVsQ= =G1na -----END PGP SIGNATURE-----
diff -Nru adios-1.9.0/debian/changelog adios-1.9.0/debian/changelog --- adios-1.9.0/debian/changelog 2016-08-25 22:46:00.000000000 +0200 +++ adios-1.9.0/debian/changelog 2016-10-22 12:01:21.000000000 +0200 @@ -1,3 +1,10 @@ +adios (1.9.0-12.1) unstable; urgency=medium + + * Non-maintainer upload + * New patch type-bool-already-defined.patch to fix FTBFS against HDF5 1.10 + + -- Gilles Filippini <[email protected]> Sat, 22 Oct 2016 12:01:20 +0200 + adios (1.9.0-12) unstable; urgency=medium * Fix for gcc 6.2: Don't define 'bool', its provided. diff -Nru adios-1.9.0/debian/patches/series adios-1.9.0/debian/patches/series --- adios-1.9.0/debian/patches/series 2016-08-25 22:46:00.000000000 +0200 +++ adios-1.9.0/debian/patches/series 2016-10-22 12:01:46.000000000 +0200 @@ -16,3 +16,4 @@ version-fix.patch libc-2.23-fixes.patch # gcc6-fixes.patch +type-bool-already-defined.patch diff -Nru adios-1.9.0/debian/patches/type-bool-already-defined.patch adios-1.9.0/debian/patches/type-bool-already-defined.patch --- adios-1.9.0/debian/patches/type-bool-already-defined.patch 1970-01-01 01:00:00.000000000 +0100 +++ adios-1.9.0/debian/patches/type-bool-already-defined.patch 2016-10-22 12:03:21.000000000 +0200 @@ -0,0 +1,17 @@ +Description: HDF5 1.10 defines type bool +Author: Gilles Filippini <[email protected]> +Index: adios-1.9.0/utils/bp2h5/bp2h5.c +=================================================================== +--- adios-1.9.0.orig/utils/bp2h5/bp2h5.c ++++ adios-1.9.0/utils/bp2h5/bp2h5.c +@@ -43,7 +43,9 @@ + #include "dmalloc.h" + #endif + +-typedef int bool; ++#ifndef bool ++typedef int bool; ++#endif + #define false 0 + #define true 1 +
