From: Aaron M. Ucko Date: Mon, 5 Oct 2020 01:37:11 +0000 (-0400) Subject: ncbi-blast+ 2.10.1-3: Fix makeblastdb V5 mode on mipsel. X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~92 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bcaf181b6d786ce85b77648643a5de52a23515ab;p=ncbi-blast%2B.git ncbi-blast+ 2.10.1-3: Fix makeblastdb V5 mode on mipsel. debian/patches/tune_lmdb_defaults: Scale down slightly more on 32-bit mips* (just mipsel in practice these days). The sizes at this point are 640 MiB there, 750 MB on other 32-bit platforms, and 20 GB on 64-bit platforms. --- diff --git a/debian/changelog b/debian/changelog index 2b93debf..2f487967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ncbi-blast+ (2.10.1-3) unstable; urgency=medium + + * debian/patches/tune_lmdb_defaults: Scale down slightly more on 32-bit + mips* (just mipsel in practice these days). The sizes at this point + are 640 MiB there, 750 MB on other 32-bit platforms, and 20 GB on + 64-bit platforms. + + -- Aaron M. Ucko Sun, 04 Oct 2020 21:37:04 -0400 + ncbi-blast+ (2.10.1-2) unstable; urgency=medium * debian/patches/bm-6.4.0 (new): Update embedded copy of BitMagic to diff --git a/debian/patches/tune_lmdb_defaults b/debian/patches/tune_lmdb_defaults index ded0c386..8cb2a84e 100644 --- a/debian/patches/tune_lmdb_defaults +++ b/debian/patches/tune_lmdb_defaults @@ -1,18 +1,20 @@ --- a/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp +++ b/c++/include/objtools/blast/seqdb_writer/writedb_lmdb.hpp -@@ -48,6 +48,11 @@ USING_SCOPE(objects); +@@ -48,6 +48,13 @@ USING_SCOPE(objects); BEGIN_NCBI_SCOPE +#if NCBI_PLATFORM_BITS >= 64 +# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (20UL * 1000 * 1000 * 1000) ++#elif defined(__mips__) ++# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (640 * 1024 * 1024) +#else +# define NCBI_WRITEDB_DEFAULT_MAP_SIZE (750 * 1000 * 1000) +#endif /// This class supports creation of a string accession to integer OID /// lmdb database -@@ -59,7 +64,8 @@ public: +@@ -59,7 +66,8 @@ public: /// Constructor for LMDB write access /// @param dbname Database name @@ -22,7 +24,7 @@ // Destructor ~CWriteDB_LMDB(); -@@ -130,7 +136,8 @@ public: +@@ -130,7 +138,8 @@ public: /// Constructor for LMDB write access /// @param dbname Database name