From: Olivier Sallou <osallou@debian.org>
Date: Mon, 2 May 2011 15:42:25 +0000 (+0000)
Subject: gcc46 error patch
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~364
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ff90806bb0225b0ed565c92a314e014af7c81dc0;p=ncbi-blast%2B.git

gcc46 error patch
---

diff --git a/debian/patches/fix_gcc46_include_error b/debian/patches/fix_gcc46_include_error
new file mode 100644
index 00000000..f95711d1
--- /dev/null
+++ b/debian/patches/fix_gcc46_include_error
@@ -0,0 +1,10 @@
+--- 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>
diff --git a/debian/patches/fix_ptrdiff_gliberr b/debian/patches/fix_ptrdiff_gliberr
deleted file mode 100644
index dac5bb20..00000000
--- a/debian/patches/fix_ptrdiff_gliberr
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 <cstddef>
- #  include <cxxabi.h>
- #endif
- #include <vector>
diff --git a/debian/patches/series b/debian/patches/series
index 9e7a7923..1992cc9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 fix_checks
-fix_ptrdiff_gliberr
+fix_gcc46_include_error