[med-svn] [ncbi-blast+] 03/08: Import upstream patch to fix Boost version detection.
Aaron M. Ucko
ucko at moszumanska.debian.org
Thu Aug 4 02:29:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
ucko pushed a commit to branch master
in repository ncbi-blast+.
commit d9babb92097242f33d3af2d5b1674214229d5442
Author: Aaron M. Ucko <ucko at debian.org>
Date: Wed Aug 3 19:04:54 2016 -0400
Import upstream patch to fix Boost version detection.
Import a fix that missed the 2.4.0 release branch as
debian/patches/fix_version_extraction.
---
debian/changelog | 4 +-
debian/patches/fix_version_extraction | 124 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index e74d1fd..12151b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ ncbi-blast+ (2.4.0-1) UNRELEASED; urgency=medium
* New upstream release. (NOT RELEASED YET.)
* Refresh patches; drop fix_kfreebsd_ftbs.patch (applied upstream).
+ * Import upstream patch to fix Boost version detection (which missed the
+ 2.4.0 release branch) as debian/patches/fix_version_extraction.
- -- Aaron M. Ucko <ucko at debian.org> Wed, 03 Aug 2016 18:58:57 -0400
+ -- Aaron M. Ucko <ucko at debian.org> Wed, 03 Aug 2016 19:04:54 -0400
ncbi-blast+ (2.3.0-2) unstable; urgency=medium
diff --git a/debian/patches/fix_version_extraction b/debian/patches/fix_version_extraction
new file mode 100644
index 0000000..14951cc
--- /dev/null
+++ b/debian/patches/fix_version_extraction
@@ -0,0 +1,124 @@
+--- a/c++/src/build-system/configure
++++ b/c++/src/build-system/configure
+@@ -31352,15 +31352,21 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++cat >/dev/null <<_NCBI_EOF
+ #include <db.h>
+-ncbi_cv_lib_berkeley_db_version=DB_VERSION_MAJOR.DB_VERSION_MINOR.DB_VERSION_PATCH
++_NCBI_EOF
++get_DB_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++DB_VERSION_MAJOR.DB_VERSION_MINOR.DB_VERSION_PATCH
++_NCBI_EOF
++}
++ncbi_cv_lib_berkeley_db_version=\`get_DB_VERSION | tr -cd 0123456789.\`
+
+ _ACEOF
+- eval "$ac_cpp $BERKELEYDB_INCLUDE conftest.$ac_ext" \
+- 2>&5 | grep '^ncbi_cv_' \
+- | tr -d "$wschars" > conftest.sh
++ eval "$ac_cpp $BERKELEYDB_INCLUDE conftest.$ac_ext" > conftest.sh \
++ 2>&5
+ . ./conftest.sh
+- rm -f contest*
++ rm -f conftest*
+
+ fi
+ { echo "$as_me:$LINENO: result: $ncbi_cv_lib_berkeley_db_version" >&5
+@@ -33569,16 +33575,27 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
++cat >/dev/null <<_NCBI_EOF
+ #include <boost/version.hpp>
+-ncbi_cv_lib_boost_version_num=BOOST_VERSION
+-ncbi_cv_lib_boost_version=BOOST_LIB_VERSION
++_NCBI_EOF
++get_BOOST_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++BOOST_VERSION
++_NCBI_EOF
++}
++get_BOOST_LIB_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++BOOST_LIB_VERSION
++_NCBI_EOF
++}
++ncbi_cv_lib_boost_version_num=\`get_BOOST_VERSION\`
++ncbi_cv_lib_boost_version=\`get_BOOST_LIB_VERSION | tr -d '"'\`
+
+ _ACEOF
+- eval "$ac_cpp $BOOST_INCLUDE conftest.$ac_ext" \
+- 2>&5 | grep '^ncbi_cv_' \
+- | tr -d "$wschars" > conftest.sh
++ eval "$ac_cpp $BOOST_INCLUDE conftest.$ac_ext" > conftest.sh \
++ 2>&5
+ . ./conftest.sh
+- rm -f contest*
++ rm -f conftest*
+
+ fi
+ { echo "$as_me:$LINENO: result: $ncbi_cv_lib_boost_version" >&5
+--- a/c++/src/build-system/configure.ac
++++ b/c++/src/build-system/configure.ac
+@@ -4905,14 +4905,20 @@ if test "$with_bdb" != "no" ; then
+ AC_CACHE_CHECK([Berkeley DB version (4.3 or newer required)],
+ ncbi_cv_lib_berkeley_db_version,
+ [AC_LANG_CONFTEST([AC_LANG_SOURCE([[
++cat >/dev/null <<_NCBI_EOF
+ #include <db.h>
+-ncbi_cv_lib_berkeley_db_version=DB_VERSION_MAJOR.DB_VERSION_MINOR.DB_VERSION_PATCH
++_NCBI_EOF
++get_DB_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++DB_VERSION_MAJOR.DB_VERSION_MINOR.DB_VERSION_PATCH
++_NCBI_EOF
++}
++ncbi_cv_lib_berkeley_db_version=\`get_DB_VERSION | tr -cd 0123456789.\`
+ ]])])
+- eval "$ac_cpp $BERKELEYDB_INCLUDE conftest.$ac_ext" \
+- 2>&AS_MESSAGE_LOG_FD | grep '^ncbi_cv_' \
+- | tr -d "$wschars" > conftest.sh
++ eval "$ac_cpp $BERKELEYDB_INCLUDE conftest.$ac_ext" > conftest.sh \
++ 2>&AS_MESSAGE_LOG_FD
+ . ./conftest.sh
+- rm -f contest*
++ rm -f conftest*
+ ])
+ case "$ncbi_cv_lib_berkeley_db_version" in
+ 1.* | 2.* | 3.* | 4.[[0-2]].* )
+@@ -5181,15 +5187,26 @@ if test "$with_boost" != "no"; then
+ AC_CACHE_CHECK([Boost version],
+ ncbi_cv_lib_boost_version,
+ [AC_LANG_CONFTEST([AC_LANG_SOURCE([[
++cat >/dev/null <<_NCBI_EOF
+ #include <boost/version.hpp>
+-ncbi_cv_lib_boost_version_num=BOOST_VERSION
+-ncbi_cv_lib_boost_version=BOOST_LIB_VERSION
++_NCBI_EOF
++get_BOOST_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++BOOST_VERSION
++_NCBI_EOF
++}
++get_BOOST_LIB_VERSION() {
++ grep '^[^#]' <<_NCBI_EOF
++BOOST_LIB_VERSION
++_NCBI_EOF
++}
++ncbi_cv_lib_boost_version_num=\`get_BOOST_VERSION\`
++ncbi_cv_lib_boost_version=\`get_BOOST_LIB_VERSION | tr -d '"'\`
+ ]])])
+- eval "$ac_cpp $BOOST_INCLUDE conftest.$ac_ext" \
+- 2>&AS_MESSAGE_LOG_FD | grep '^ncbi_cv_' \
+- | tr -d "$wschars" > conftest.sh
++ eval "$ac_cpp $BOOST_INCLUDE conftest.$ac_ext" > conftest.sh \
++ 2>&AS_MESSAGE_LOG_FD
+ . ./conftest.sh
+- rm -f contest*
++ rm -f conftest*
+ ])
+ AC_DEFINE_UNQUOTED(NCBI_EXPECTED_BOOST_VERSION,
+ $ncbi_cv_lib_boost_version_num,
diff --git a/debian/patches/series b/debian/patches/series
index 4055182..349f163 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ no_multiarch_rpath
use_pie_for_apps
skip_services_unit_test
fix_configure
+fix_version_extraction
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-blast+.git
More information about the debian-med-commit
mailing list