From: Olivier Sallou <osallou@debian.org>
Date: Tue, 3 May 2011 06:25:44 +0000 (+0000)
Subject: headers update, apply patch from upstream for gcc 4.6
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~363
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab47b42f4d21b8bcbb55cad4abcca6362b7bb89e;p=ncbi-blast%2B.git

headers update, apply patch from upstream for gcc 4.6
---

diff --git a/debian/patches/fix_checks b/debian/patches/fix_checks
index bfdbc51f..f1b82b27 100644
--- a/debian/patches/fix_checks
+++ b/debian/patches/fix_checks
@@ -1,3 +1,9 @@
+Subject:  command time not found when using shell
+
+ * scripts/common/check/check_make_unix.sh: use bash and remove exec usage
+
+Author: Olivier Sallou <olivier.sallou@irisa.fr>
+Last-Update: 2011-05-03
 --- a/scripts/common/check/check_make_unix.sh
 +++ b/scripts/common/check/check_make_unix.sh
 @@ -503,8 +503,8 @@
diff --git a/debian/patches/fix_gcc46_include_error b/debian/patches/fix_gcc46_include_error
index f95711d1..374c4ac2 100644
--- a/debian/patches/fix_gcc46_include_error
+++ b/debian/patches/fix_gcc46_include_error
@@ -1,10 +1,16 @@
---- a/src/corelib/ncbi_stack_linux.cpp
-+++ b/src/corelib/ncbi_stack_linux.cpp
-@@ -32,6 +32,7 @@
- #include <ncbi_pch.hpp>
- #include <execinfo.h>
- #if NCBI_COMPILER_VERSION >= 310
-+#  include<stddef.h>
- #  include <cxxabi.h>
- #endif
- #include <vector>
+Subject: GCC 4.6 compilation error due to missing def
+
+ * include/corelib/ncbistre.hpp: Add stddef definition required by gcc4.6
+
+Author: Olivier Sallou <olivier.sallou@irisa.fr>
+Last-Update: 2011-05-03
+--- a/include/corelib/ncbistre.hpp
++++ b/include/corelib/ncbistre.hpp
+@@ -116,6 +116,7 @@
+ #define SEEKOFF         PUBSEEKOFF
+ 
+ #include <string>
++#include <stddef.h>
+ 
+ 
+ // (BEGIN_NCBI_SCOPE must be followed by END_NCBI_SCOPE later in this file)