From aba1272264e58d985a6804f96420097b410c81ef Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Tue, 6 Aug 2024 21:37:02 -0400 Subject: [PATCH] Reinstate big-endian builds, with default blastdb_version 4. * debian/control: Reinstate big-endian builds, which can be salvaged adequately well. * debian/patches/big_endian_workaround (new): On big-endian architectures, roll makeblastdb's and makeprofiledb's default blastdb_version back to 4 pending a proper fix. Some things, including in particular q2-feature-classifier, will still explicitly request version 5, but everything else should be OK. (See #1077777.) --- debian/changelog | 11 +++++++-- debian/control | 1 - debian/patches/big_endian_workaround | 34 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 debian/patches/big_endian_workaround diff --git a/debian/changelog b/debian/changelog index 7d1220d5..99078fc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ ncbi-blast+ (2.16.0+ds-6) UNRELEASED; urgency=medium * NOT RELEASED YET. - - -- Aaron M. Ucko Tue, 06 Aug 2024 21:35:41 -0400 + * debian/control: Reinstate big-endian builds, which can be salvaged + adequately well. + * debian/patches/big_endian_workaround (new): On big-endian + architectures, roll makeblastdb's and makeprofiledb's default + blastdb_version back to 4 pending a proper fix. Some things, + including in particular q2-feature-classifier, will still explicitly + request version 5, but everything else should be OK. (See #1077777.) + + -- Aaron M. Ucko Tue, 06 Aug 2024 21:37:01 -0400 ncbi-blast+ (2.16.0+ds-5) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9c986a02..08ae5581 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Olivier Sallou , Section: science Priority: optional Build-Depends: debhelper-compat (= 13), - architecture-is-little-endian, autoconf2.69 Build-Depends-Arch: libboost-test-dev, libbz2-dev, diff --git a/debian/patches/big_endian_workaround b/debian/patches/big_endian_workaround new file mode 100644 index 00000000..452d4052 --- /dev/null +++ b/debian/patches/big_endian_workaround @@ -0,0 +1,34 @@ +--- a/c++/src/app/blastdb/makeblastdb.cpp ++++ b/c++/src/app/blastdb/makeblastdb.cpp +@@ -293,7 +293,13 @@ void CMakeBlastDBApp::Init() + arg_desc->AddDefaultKey("blastdb_version", "version", + "Version of BLAST database to be created", + CArgDescriptions::eInteger, +- NStr::NumericToString(static_cast(eBDB_Version5))); ++ NStr::NumericToString(static_cast ++#ifdef WORDS_BIGENDIAN ++ (eBDB_Version4) ++#else ++ (eBDB_Version5) ++#endif ++ )); + arg_desc->SetConstraint("blastdb_version", + new CArgAllow_Integers(eBDB_Version4, eBDB_Version5)); + arg_desc->AddDefaultKey("max_file_sz", "number_of_bytes", +--- a/c++/src/app/blastdb/makeprofiledb.cpp ++++ b/c++/src/app/blastdb/makeprofiledb.cpp +@@ -420,7 +420,13 @@ void CMakeProfileDBApp::x_SetupArgDescri + arg_desc->AddDefaultKey("blastdb_version", "version", + "Version of BLAST database to be created", + CArgDescriptions::eInteger, +- NStr::NumericToString(static_cast(eBDB_Version5))); ++ NStr::NumericToString(static_cast ++#ifdef WORDS_BIGENDIAN ++ (eBDB_Version4) ++#else ++ (eBDB_Version5) ++#endif ++ )); + arg_desc->SetConstraint("blastdb_version", + new CArgAllow_Integers(eBDB_Version4, eBDB_Version5)); + diff --git a/debian/patches/series b/debian/patches/series index 5e632f40..d754932e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -20,3 +20,4 @@ support_gcc10 run_perl_directly tune_lmdb_defaults 2to3 +big_endian_workaround -- 2.30.2