From 5e93c8f2dbd87ad91a773158e436e2ba4c9e0971 Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Fri, 5 Aug 2016 19:42:47 -0400 Subject: [PATCH] Add a new support_x32 patch (#833541). Avoid picking up wrong inline assembly. --- debian/changelog | 4 +++- debian/patches/series | 1 + debian/patches/support_x32 | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 debian/patches/support_x32 diff --git a/debian/changelog b/debian/changelog index 8ff370ed..6aeb28b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ ncbi-blast+ (2.4.0-3) UNRELEASED; urgency=medium (Closes: #833538.) * Reinstate and refresh the hurd_fixes patch, which mostly still applies. (Closes: #833539.) + * Add a new support_x32 patch to avoid picking up wrong inline assembly. + (Closes: #833541.) - -- Aaron M. Ucko Fri, 05 Aug 2016 19:40:28 -0400 + -- Aaron M. Ucko Fri, 05 Aug 2016 19:42:47 -0400 ncbi-blast+ (2.4.0-2) unstable; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index 7b3674e6..2fd0e8c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ skip_services_unit_test fix_configure fix_version_extraction support_recent_boost +support_x32 diff --git a/debian/patches/support_x32 b/debian/patches/support_x32 new file mode 100644 index 00000000..8c8874fc --- /dev/null +++ b/debian/patches/support_x32 @@ -0,0 +1,11 @@ +--- a/c++/include/corelib/impl/ncbi_atomic_defs.h ++++ b/c++/include/corelib/impl/ncbi_atomic_defs.h +@@ -117,7 +117,7 @@ extern "C" { + ((defined(__i386) || defined(__sparc) || defined(__x86_64)) && \ + !defined(__GLIBCPP__) /* < 3.0 or >= 3.4 */) && \ + (!defined(__GLIBCXX__) || !defined(NCBI_TCHECK))) +-# if defined(__x86_64) ++# if defined(__x86_64) && !defined(_ILP32) + # define NCBI_COUNTER_64_BIT + # endif + # ifdef NCBI_COUNTER_64_BIT -- 2.30.2