debian/patches/fix_x86isms: New.

Conditionally stub out CCpuFeatures::InstructionSet::InstructionSet,
which compiles only on x86.

diff --git a/debian/changelog b/debian/changelog
index 7df9786ddd1d49aadf57eefb9a807ba814d1938f..9b1f203180f3591b64b9d4591bb08171baa415bb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,14 @@ ncbi-blast+ (2.10.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.  (NOT RELEASED YET.)
     - Among other changes, "fix tblastn mt issue".  (Closes: #970344.)
+  * debian/patches/fix_x86isms (new): Conditionally stub out
+    CCpuFeatures::InstructionSet::InstructionSet, which compiles only on x86.
   * debian/patches/{hurd_fixes,run_perl_directly}: Rebase.
   * debian/patches/{reprobuild,support_x32}: Refresh (had fuzz).
   * debian/patches/support_gcc10: Drop build-system portions, incorporated
     upstream as of this release.
 
- -- Aaron M. Ucko <ucko@debian.org>  Sat, 19 Sep 2020 21:15:01 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 19 Sep 2020 21:21:01 -0400
 
 ncbi-blast+ (2.10.0-3) unstable; urgency=medium
 

diff --git a/debian/patches/fix_x86isms b/debian/patches/fix_x86isms
new file mode 100644 (file)
index 0000000..1683357
--- /dev/null
+++ b/debian/patches/fix_x86isms
@@ -0,0 +1,18 @@
+--- a/c++/src/corelib/ncbi_system.cpp
++++ b/c++/src/corelib/ncbi_system.cpp
+@@ -1422,6 +1422,7 @@ CCpuFeatures::InstructionSet::Instructio
+       f81_ECX_  { 0 },
+       f81_EDX_  { 0 }
+ {
++#if defined(__i386__)  ||  defined(__x86_64__)
+     int nIds   = 0;
+     int nExIds = 0;
+ 
+@@ -1506,6 +1507,7 @@ CCpuFeatures::InstructionSet::Instructio
+         memcpy(brand + 32, m_ExtData[4].data(), sizeof(registers));
+         m_BrandStr = brand;
+     }
++#endif
+ };
+ 
+ 

diff --git a/debian/patches/series b/debian/patches/series
index f6a3d5d7af5ebf4e4caddb5607f4b8927ad65991..d255e29b0093270d97acf42b60d2783c886bd07b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ spelling
 support_gcc10
 run_perl_directly
 tune_32bit_lmdb_defaults
+fix_x86isms