Build against VDB where available (amd64/arm64/x32) (#1100037).

* debian/control: Build-depend on libncbi-vdb-dev where available.
* debian/rules: Build against (packaged!) VDB where available, using
  logic cribbed from ncbi-igblast.

diff --git a/debian/changelog b/debian/changelog
index cf89c7deb3469bebb17fd7c98e73e2e0d0993390..16a9979343c561291906cffc1be8e867b3c39b59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 ncbi-blast+ (2.16.0+ds-7) UNRELEASED; urgency=medium
 
   * NOT RELEASED YET.
+  * debian/control: Build-depend on libncbi-vdb-dev where available
+    (amd64, arm64, and x32).
   * debian/patches/fix_bm_for_gcc15 (new): Cherry-pick a BitMagic fix
     needed for modern compilers, adjusting the path appropriately.'
     (Closes: #1097434.)
+  * debian/rules: Build against (packaged!) VDB where available, using
+    logic cribbed from ncbi-igblast.  (Closes: #1100037.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Sat, 03 May 2025 22:16:44 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Sat, 03 May 2025 22:20:24 -0400
 
 ncbi-blast+ (2.16.0+ds-6) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index 08ae55814906cf0408c39229ef80072e727065f2..377a1be2232b80ba401f1ee173f34f9bf2998556 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends-Arch: libboost-test-dev,
                     libgnutls28-dev,
                     liblmdb-dev,
                     libmbedtls-dev,
+                    libncbi-vdb-dev [amd64 arm64 x32],
                     libnghttp2-dev,
                     libpcre2-dev,
                     libsqlite3-dev,

diff --git a/debian/rules b/debian/rules
index 8455890a3bfd7b2a203fd403b5e58cbeccb777c7..e5203511150378e76c0ab69b3bc8bcb89e6cdeaa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,21 @@ endif
 
 DEB_CONFIGURE_COMMON_FLAGS=--without-autodep --without-makefile-auto-update \
     --with-flat-makefile --without-caution --without-dbapi --without-lzo \
-    --without-debug --without-downloaded-vdb --without-sse42
+    --without-debug --without-sse42
 DEB_CONFIGURE_EXTRA_FLAGS=$(DEB_CONFIGURE_COMMON_FLAGS) --with-dll --with-mt \
     --with-runpath=/usr/lib/ncbi-blast+ --with-build-root=BUILD \
     --with-mbedtls --with-pcre2
 
+ifneq (,$(filter amd64 arm64 x32,$(DEB_HOST_ARCH)))
+ VDB_SUBTREES=os/$(DEB_HOST_ARCH_OS) os/unix cc/gcc/$(DEB_HOST_GNU_CPU) cc/gcc
+ VDB_INC=-I/usr/include/ncbi-vdb
+ VDB_INCLUDE=$(VDB_INC) $(VDB_SUBTREES:%=$(VDB_INC)/%)
+ DEB_CONFIGURE_COMMON_FLAGS += --with-vdb=/usr VDB_INCLUDE="$(VDB_INCLUDE)"
+else
+ DEB_CONFIGURE_COMMON_FLAGS += --without-downloaded-vdb
+endif
+
+
 proj=algo/blast/ app/ objmgr/ objtools/align_format/ objtools/blast/
 
 #ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))