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 2b93debf98d2fc76f5e10c5c4ba961cbf59f6211..2f48796797a43c673177d8e9cc99ed8e68211558 100644 (file)
--- 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 <ucko@debian.org>  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 ded0c386975b75a69f71703e39df7452ba8226cc..8cb2a84e85b0ce97fbcf895273cd1f4a2f68298b 100644 (file)
--- 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