From 564d7eb36d9075ecb49902aba81d26ec56b61b64 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Thu, 2 Jul 2015 20:20:51 +0000 Subject: [PATCH] d/patches/fix_compilation: Add an upstream patch to include/util/bitset/bmconst.h to fix builds with GCC 5 on platforms such as arm64 on which char is unsigned. (Closes: #790667.) --- debian/changelog | 5 ++++- debian/patches/fix_compilation | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b574bc7a..5eaace2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ ncbi-blast+ (2.2.30-4) UNRELEASED; urgency=medium * NOT YET RELEASED. + * d/patches/fix_compilation: Add an upstream patch to + include/util/bitset/bmconst.h to fix builds with GCC 5 on platforms + such as arm64 on which char is unsigned. (Closes: #790667.) - -- Aaron M. Ucko Thu, 02 Jul 2015 16:16:36 -0400 + -- Aaron M. Ucko Thu, 02 Jul 2015 16:20:49 -0400 ncbi-blast+ (2.2.30-3) unstable; urgency=medium diff --git a/debian/patches/fix_compilation b/debian/patches/fix_compilation index 43aae53b..f5a8940b 100644 --- a/debian/patches/fix_compilation +++ b/debian/patches/fix_compilation @@ -5,7 +5,7 @@ Author: Olivier Sallou Last-Updated: 2014-12-14 --- a/c++/src/util/regexp/pcretest.c +++ b/c++/src/util/regexp/pcretest.c -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ for (;;) /* Read the next line by normal means, prompting if the file is stdin. */ { @@ -14,3 +14,19 @@ Last-Updated: 2014-12-14 if (fgets((char *)here, rlen, f) == NULL) return (here == start)? NULL : start; } +--- a/c++/include/util/bitset/bmconst.h ++++ b/c++/include/util/bitset/bmconst.h +@@ -147,11 +147,11 @@ const unsigned DeBruijn_bit_position: + */ + template struct first_bit_table + { +- static const char _idx[256]; ++ static const signed char _idx[256]; + }; + + template +-const char first_bit_table::_idx[256] = { ++const signed char first_bit_table::_idx[256] = { + -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -- 2.30.2