From e4a51877a570458908d209bdc3f69ed1b7ea8afd Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sat, 19 Sep 2020 21:21:03 -0400 Subject: [PATCH] debian/patches/fix_x86isms: New. Conditionally stub out CCpuFeatures::InstructionSet::InstructionSet, which compiles only on x86. --- debian/changelog | 4 +++- debian/patches/fix_x86isms | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix_x86isms diff --git a/debian/changelog b/debian/changelog index 7df9786d..9b1f2031 100644 --- 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 Sat, 19 Sep 2020 21:15:01 -0400 + -- Aaron M. Ucko 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 index 00000000..1683357a --- /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 f6a3d5d7..d255e29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -16,3 +16,4 @@ spelling support_gcc10 run_perl_directly tune_32bit_lmdb_defaults +fix_x86isms -- 2.30.2