[adios] 01/04: Fix for gcc 6.2: Don't define 'bool', its provided.

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Oct 28 09:34:17 UTC 2016


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/1.9.0-12
in repository adios.

commit 025dd256667946fce99820b38cab0405f1efbf7b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Aug 25 21:46:28 2016 +0100

    Fix for gcc 6.2: Don't define 'bool', its provided.
---
 debian/changelog                |  6 ++++++
 debian/patches/gcc6-fixes.patch | 18 ++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4becd96..0bc5832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.9.0-11) UNRELEASED; urgency=medium
+
+  * Fix for gcc 6.2: Don't define 'bool', its provided.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 25 Aug 2016 21:46:00 +0100
+
 adios (1.9.0-10) unstable; urgency=medium
 
   * Standards-Version: 3.9.8; no changes required
diff --git a/debian/patches/gcc6-fixes.patch b/debian/patches/gcc6-fixes.patch
new file mode 100644
index 0000000..f6a4035
--- /dev/null
+++ b/debian/patches/gcc6-fixes.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Use std11 'bool' as now provided in gcc 6.2
+Last-Updated: 2016-08-29
+Forwarded: no
+
+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,7 @@
+ #include "dmalloc.h"
+ #endif
+ 
+-typedef int bool;
++// bool is now supported on gcc6.2 : typedef int bool;
+ #define false 0
+ #define true  1
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 108b1c2..e36c299 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ multiarch_safe.patch
 py3.patch
 version-fix.patch
 libc-2.23-fixes.patch
+gcc6-fixes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git



More information about the debian-science-commits mailing list