<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b9a765ebcc4e5f62848566cfd59d69d9828a790a">https://github.com/macports/macports-base/commit/b9a765ebcc4e5f62848566cfd59d69d9828a790a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b9a765eb Use simpler check for SQLITE_VERSION_NUMBER
</span>b9a765eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b9a765ebcc4e5f62848566cfd59d69d9828a790a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 24 04:18:10 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> Use simpler check for SQLITE_VERSION_NUMBER
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Hopefully more portable too.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63074
</span>---
aclocal.m4 | 6 +++---
configure | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aclocal.m4 b/aclocal.m4
</span><span style='display:block; white-space:pre;color:#808080;'>index d4809613..5777ecbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aclocal.m4
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1204,18 +1204,17 @@ AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
</span> LIBS="$LIBS $LIBS_SQLITE3"
AC_CACHE_VAL([mp_cv_sqlite_version], [
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="-dM $CPPFLAGS"
</span> AC_PREPROC_IFELSE(
[AC_LANG_SOURCE(
[[
#include <sqlite3.h>
#ifndef SQLITE_VERSION_NUMBER
# error "SQLITE_VERSION_NUMBER undefined"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int mp_sqlite_version = SQLITE_VERSION_NUMBER;
</span> #endif
]]
)],
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [mp_cv_sqlite_version=`grep '^[[[:space:]]]*int mp_sqlite_version = [[0-9]]*;$' conftest.i | sed -E 's/[[^0-9]]*([[0-9]]+);/\1/'`],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [mp_cv_sqlite_version=`fgrep SQLITE_VERSION_NUMBER conftest.i | sed -E 's/[[^0-9]]*([[0-9]]+)/\1/'`],
</span> [AC_MSG_ERROR("SQLITE_VERSION_NUMBER undefined or sqlite3.h not found")]
)
])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1225,6 +1224,7 @@ AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
</span>
AC_MSG_CHECKING([for SQLite version at runtime])
AC_CACHE_VAL([mp_cv_sqlite_run_version], [
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="$mp_check_sqlite_version_cppflags_save $CFLAGS_SQLITE3"
</span> AC_RUN_IFELSE(
[AC_LANG_SOURCE(
[[
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index c5102341..e71cddea 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8231,21 +8231,20 @@ then :
</span> printf %s "(cached) " >&6
else $as_nop
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="-dM $CPPFLAGS"
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sqlite3.h>
#ifndef SQLITE_VERSION_NUMBER
# error "SQLITE_VERSION_NUMBER undefined"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int mp_sqlite_version = SQLITE_VERSION_NUMBER;
</span> #endif
_ACEOF
if ac_fn_c_try_cpp "$LINENO"
then :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_cv_sqlite_version=`grep '^[[:space:]]*int mp_sqlite_version = [0-9]*;$' conftest.i | sed -E 's/[^0-9]*([0-9]+);/\1/'`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp_cv_sqlite_version=`fgrep SQLITE_VERSION_NUMBER conftest.i | sed -E 's/[^0-9]*([0-9]+)/\1/'`
</span> else $as_nop
as_fn_error $? "\"SQLITE_VERSION_NUMBER undefined or sqlite3.h not found\"" "$LINENO" 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8266,6 +8265,7 @@ then :
</span> printf %s "(cached) " >&6
else $as_nop
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="$mp_check_sqlite_version_cppflags_save $CFLAGS_SQLITE3"
</span> if test "$cross_compiling" = yes
then :
mp_cv_sqlite_run_version=$mp_cv_sqlite_version
</pre><pre style='margin:0'>
</pre>