[med-svn] [Git][med-team/ncbi-blastplus][master] 4 commits: Start work on ncbi-blast+ 2.17.0+ds-7, mainly for new Boost.
Aaron M. Ucko (@ucko)
gitlab at salsa.debian.org
Mon Mar 9 01:28:45 GMT 2026
Aaron M. Ucko pushed to branch master at Debian Med / ncbi-blastplus
Commits:
30bcca3e by Aaron M. Ucko at 2026-03-08T21:18:11-04:00
Start work on ncbi-blast+ 2.17.0+ds-7, mainly for new Boost.
- - - - -
af3c9d64 by Aaron M. Ucko at 2026-03-08T21:22:24-04:00
Add debian/patches/support_boost_1.87 (#1129798).
Fix builds with Boost 1.87 (which dropped ...::tt_detail::dummy_cond)
through at least 1.90.
- - - - -
366b6b8c by Aaron M. Ucko at 2026-03-08T21:23:56-04:00
Standards-Version: 4.7.3 (routine-update)
- - - - -
5c0ee757 by Aaron M. Ucko at 2026-03-08T21:26:23-04:00
Finalize ncbi-blast+ 2.17.0+ds-7 for unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/support_boost_1.87
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+ncbi-blast+ (2.17.0+ds-7) unstable; urgency=medium
+
+ * debian/patches/support_boost_1.87 (new): Fix builds with Boost 1.87
+ (which dropped ...::tt_detail::dummy_cond) through at least 1.90.
+ (Closes: #1129798.)
+ * Standards-Version: 4.7.3 (routine-update)
+
+ -- Aaron M. Ucko <ucko at debian.org> Sun, 08 Mar 2026 21:26:22 -0400
+
ncbi-blast+ (2.17.0+ds-6) unstable; urgency=medium
* debian/patches/support_x32: Unbreak 64-bit builds.
=====================================
debian/control
=====================================
@@ -1,5 +1,5 @@
Source: ncbi-blast+
-Standards-Version: 4.7.2
+Standards-Version: 4.7.3
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders:
Olivier Sallou <osallou at debian.org>,
=====================================
debian/patches/series
=====================================
@@ -23,3 +23,4 @@ tune_lmdb_defaults
big_endian_workaround
# fix_bm_for_gcc15
zcf-simde-crc32c
+support_boost_1.87
=====================================
debian/patches/support_boost_1.87
=====================================
@@ -0,0 +1,107 @@
+From 3bb6d8a56d9cd72918f9a6d1d75f5492aff189d9 Mon Sep 17 00:00:00 2001
+From: Andrei Gourianov <gouriano at ncbi.nlm.nih.gov>
+Date: Tue, 22 Jul 2025 19:06:09 +0000
+Subject: [PATCH] dummy_cond was removed in boost/1.87. JIRA: CXX-14098
+
+git-svn-id: https://anonsvn.ncbi.nlm.nih.gov/repos/v1/trunk/c++@104905 78c7ea69-d796-4a43-9a09-de51944f1b03
+---
+ c++/include/corelib/test_boost.hpp | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/c++/include/corelib/test_boost.hpp b/c++/include/corelib/test_boost.hpp
+index 49817272cd9..889c9cc01fd 100644
+--- a/c++/include/corelib/test_boost.hpp
++++ b/c++/include/corelib/test_boost.hpp
+@@ -113,6 +113,11 @@ inline bool BOOST_CURRENT_TEST_PASSED()
+ return rc.passed();
+ }
+
++#if BOOST_VERSION >= 108700
++#define BOOST_TEST_DETAIL_DUMMY_COND false
++#else
++#define BOOST_TEST_DETAIL_DUMMY_COND ::boost::test_tools::tt_detail::dummy_cond()
++#endif
+
+ #if BOOST_VERSION >= 105900
+ # if BOOST_VERSION >= 106000
+@@ -139,7 +144,7 @@ do { \
+ BOOST_STRINGIZE( S ), \
+ TL, CHECK_MSG, _ ); \
+ } \
+-} while( ::boost::test_tools::tt_detail::dummy_cond() ) \
++} while( BOOST_TEST_DETAIL_DUMMY_COND ) \
+ /**/
+
+ # define BOOST_THROW_AFFIX ""
+@@ -169,7 +174,7 @@ do { \
+ BOOST_STRINGIZE( S ), \
+ TL, CHECK_MSG, _ ); \
+ } \
+-} while( ::boost::test_tools::tt_detail::dummy_cond() ) \
++} while( BOOST_TEST_DETAIL_DUMMY_COND ) \
+ /**/
+ # endif
+
+@@ -192,7 +197,7 @@ do { \
+ BOOST_STRINGIZE( S ), \
+ TL, CHECK_MSG, _ ); \
+ } \
+-} while( ::boost::test_tools::tt_detail::dummy_cond() ) \
++} while( BOOST_TEST_DETAIL_DUMMY_COND ) \
+ /**/
+ #else
+ # define BOOST_CHECK_THROW_IMPL_EX( S, E, P, prefix, TL, guard ) \
+@@ -459,7 +464,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ BOOST_CHECK_NO_THROW_IMPL_EX(_ncbitest_value = (P);, TL, \
+ _ncbitest_guard.Guard(NCBI_NS_NCBI::g_NcbiTestMutex)); \
+ BOOST_TEST_TOOL_IMPL(2, _ncbitest_value, check_descr, TL, CT, _); \
+- } while( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ # define BOOST_PP_BOOL_00 0
+
+@@ -481,7 +486,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ descr, TL, CT, \
+ (_ncbitest_value1)(BOOST_STRINGIZE(A1)) \
+ (_ncbitest_value2)(BOOST_STRINGIZE(A2))); \
+- } while( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ # define BOOST_CHECK_IMPL_MT_SAFE( P, check_descr, TL, CT ) \
+ do { \
+@@ -489,7 +494,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ NCBI_NS_NCBI::CFastMutexGuard _ncbitest_guard \
+ (NCBI_NS_NCBI::g_NcbiTestMutex); \
+ BOOST_TEST_TOOL_IMPL( 2, _ncbitest_value, check_descr, TL, CT, _ ); \
+- } while( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ # define BOOST_CHECK_WITH_2_ARGS_IMPL_MT_SAFE(P, descr, TL, CT, A1, A2) \
+ do { \
+@@ -501,7 +506,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ descr, TL, CT, \
+ (_ncbitest_value1)(BOOST_STRINGIZE(A1)) \
+ (_ncbitest_value2)(BOOST_STRINGIZE(A2))); \
+- } while( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ # define BOOST_CLOSE_IMPL_MT_SAFE( L, R, T, TL ) \
+ do { \
+@@ -514,7 +519,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ 00, ::boost::test_tools::check_is_close_t(), "", TL, CHECK_CLOSE, \
+ (_ncbitest_l)(BOOST_STRINGIZE(L))(_ncbitest_r)(BOOST_STRINGIZE(R))\
+ (_ncbitest_t)("")); \
+- } while ( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while ( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ # define BOOST_EQUAL_COLLECTIONS_IMPL_MT_SAFE( LB, LE, RB, RE, TL ) \
+ do { \
+@@ -523,7 +528,7 @@ static struct BOOST_JOIN( test_name, _timeout_spec ) \
+ BOOST_TEST_TOOL_IMPL( \
+ 1, ::boost::test_tools::tt_detail::equal_coll_impl(), \
+ "", TL, CHECK_EQUAL_COLL, (LB)(LE)(RB)(RE) ); \
+- } while( ::boost::test_tools::tt_detail::dummy_cond() )
++ } while( BOOST_TEST_DETAIL_DUMMY_COND )
+
+ #else
+
View it on GitLab: https://salsa.debian.org/med-team/ncbi-blastplus/-/compare/1de60835a993d803c42a56a0acaa9bd26bb0a2b8...5c0ee75780f93421626142326a303a0b2a2623da
--
View it on GitLab: https://salsa.debian.org/med-team/ncbi-blastplus/-/compare/1de60835a993d803c42a56a0acaa9bd26bb0a2b8...5c0ee75780f93421626142326a303a0b2a2623da
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260309/7d4c1bef/attachment-0001.htm>
More information about the debian-med-commit
mailing list