<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/11d2b06e12b6f5bb3005f234765ecf0a4fbef8bb">https://github.com/macports/macports-base/commit/11d2b06e12b6f5bb3005f234765ecf0a4fbef8bb</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 11d2b06e1 Use Tcl's bundled sqlite3
</span>11d2b06e1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 11d2b06e12b6f5bb3005f234765ecf0a4fbef8bb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Sep 26 23:15:39 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Use Tcl's bundled sqlite3
</span>---
Mk/macports.autoconf.mk.in | 4 +-
aclocal.m4 | 144 -------------
configure | 270 +------------------------
configure.ac | 15 +-
src/config.h.in | 10 -
src/cregistry/Makefile.in | 4 +-
src/cregistry/entry.c | 20 +-
src/cregistry/file.c | 6 +-
src/cregistry/sql.c | 18 +-
src/cregistry/sqlext.c | 4 -
src/macports1.0/diagnose.tcl | 2 -
src/registry2.0/Makefile.in | 4 +-
vendor/patches/tcl/sqlite-extern.patch | 24 +++
vendor/tcl8.6.12/pkgs/sqlite3.36.0/Makefile.in | 2 +-
vendor/tcl8.6.12/pkgs/sqlite3.36.0/configure | 2 +-
vendor/tclsh.in | 2 +-
16 files changed, 67 insertions(+), 464 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Mk/macports.autoconf.mk.in b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ed36f1a9..bbf3ef972 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Mk/macports.autoconf.mk.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ UNIVERSAL_ARCHFLAGS = @UNIVERSAL_ARCHFLAGS@
</span>
READLINE_CFLAGS =
MD5_CFLAGS =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SQLITE3_CFLAGS = @CFLAGS_SQLITE3@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_CPPFLAGS = @SQLITE3_CPPFLAGS@
</span> CURL_CFLAGS = @CFLAGS_LIBCURL@
LDFLAGS = @LDFLAGS@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
</span> LIBS = @LIBS@
READLINE_LIBS = @READLINE_LIBS@
MD5_LIBS = @MD5_LIBS@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-SQLITE3_LIBS = @LDFLAGS_SQLITE3@ @LIBS_SQLITE3@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBS = @TCL_BIN_DIR@/pkgs/@SQLITE3_LIBNAME@/lib@SQLITE3_LIBNAME@$(SHLIB_SUFFIX)
</span> CURL_LIBS = @LDFLAGS_LIBCURL@
INSTALL = @INSTALL@
MTREE = @MTREE@
<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 1a1f6bf9c..f0cb41583 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;'>@@ -901,62 +901,6 @@ AC_DEFUN([MP_LIBCURL_FLAGS],[
</span> AC_SUBST(LDFLAGS_LIBCURL)
])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# MP_SQLITE3_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Sets the flags to compile with libsqlite3 and tclsqlite3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Arguments:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# None.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# pkgconfig, libsqlite3 in /usr/lib, or user parameters to define the flags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Results:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# defines some help strings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sets CFLAGS_SQLITE3, LIBS_SQLITE3 and LDFLAGS_SQLITE3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#---------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_DEFUN([MP_SQLITE3_FLAGS],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first sqlite3 itself
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_WITH(sqlite3prefix,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-sqlite3prefix base directory for the sqlite3 install ('/usr', '/usr/local', ...)],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ sqlite3prefix=$withval ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$sqlite3prefix" = "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see if it's somewhere like /usr that needs no extra flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADER(sqlite3.h, [],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # nope - try pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PATH_PROG([PKG_CONFIG], [pkg-config])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$PKG_CONFIG" = "x" || ! $PKG_CONFIG --exists sqlite3; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([cannot find sqlite3 header])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=$($PKG_CONFIG --libs-only-L --libs-only-other sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3=$($PKG_CONFIG --libs-only-l sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for tclsqlite below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$mp_sqlite3_dir" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite3_dir=${mp_sqlite3_dir}/lib/sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check if we have sqlite3ext.h, using the appropriate cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS_OLD="${CPPFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_HEADERS(sqlite3ext.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS_OLD}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(CFLAGS_SQLITE3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(LDFLAGS_SQLITE3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(LIBS_SQLITE3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> dnl This macro tests if the compiler supports GCC's
dnl __attribute__ syntax for unused variables/parameters
AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1164,94 +1108,6 @@ AC_DEFUN([MP_WERROR],[
</span> AC_SUBST([CFLAGS_WERROR])
])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MP_CHECK_SQLITE_VERSION --
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check the version of SQLite that was found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Arguments:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# None.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Requires:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MP_SQLITE3_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Depends:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# AC_LANG_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Results:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Result is cached.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Sets mp_sqlite_version to the older of the SQLite versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# found in the header and at runtime, in the same numeric format
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# as SQLITE_VERSION_NUMBER.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (Runtime check is skipped if cross-compiling and the result is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# then always the header version.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_REQUIRE([MP_SQLITE3_FLAGS])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for SQLite version in header])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_cppflags_save=$CPPFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_ldflags_save=$LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_libs_save=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$LDFLAGS $LDFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS $LIBS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CACHE_VAL([mp_cv_sqlite_version], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="-dM $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PREPROC_IFELSE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_LANG_SOURCE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sqlite3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef SQLITE_VERSION_NUMBER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "SQLITE_VERSION_NUMBER undefined"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [mp_cv_sqlite_version=`fgrep SQLITE_VERSION_NUMBER conftest.i | sed -E 's/[[^0-9]]*([[0-9]]+)/\1/'`],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_MSG_ERROR("SQLITE_VERSION_NUMBER undefined or sqlite3.h not found")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(${mp_cv_sqlite_version})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite_version=${mp_cv_sqlite_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for SQLite version at runtime])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CACHE_VAL([mp_cv_sqlite_run_version], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$mp_check_sqlite_version_cppflags_save $CFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_RUN_IFELSE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_LANG_SOURCE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sqlite3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int vers = sqlite3_libversion_number();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (argc > 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%d\n", vers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [mp_cv_sqlite_run_version=`./conftest$EXEEXT noisy`],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AC_MSG_ERROR("Failed to run sqlite3_libversion_number test program")],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [mp_cv_sqlite_run_version=$mp_cv_sqlite_version]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT(${mp_cv_sqlite_run_version})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$mp_cv_sqlite_run_version" -lt "$mp_cv_sqlite_version"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite_version=$mp_cv_sqlite_run_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=$mp_check_sqlite_version_cppflags_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=$mp_check_sqlite_version_ldflags_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$mp_check_sqlite_version_libs_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #------------------------------------------------------------------------
# MP_PLATFORM --
#
<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 fd3965101..8dc5b7515 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;'>@@ -652,6 +652,8 @@ ac_includes_default="\
</span> ac_header_c_list=
ac_subst_vars='LTLIBOBJS
LIBOBJS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBNAME
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_CPPFLAGS
</span> INCLUDES
INTREE_TCLSH
TCLSH
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -685,10 +687,6 @@ TRACEMODE_SUPPORT
</span> EGREP
GREP
CPP
<span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBS_SQLITE3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LDFLAGS_SQLITE3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS_SQLITE3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_CONFIG
</span> LDFLAGS_LIBCURL
CFLAGS_LIBCURL
CURL_CONFIG
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -868,7 +866,6 @@ with_startupitems
</span> with_universal_archs
enable_readline
with_curlprefix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-with_sqlite3prefix
</span> enable_shared
'
ac_precious_vars='build_alias
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1551,7 +1548,6 @@ Optional Packages:
</span> --with-universal-archs="CPU"
universal CPU architectures (space separated)
--with-curlprefix base directory for the curl install ('/usr', '/usr/local', ...)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sqlite3prefix base directory for the sqlite3 install ('/usr', '/usr/local', ...)
</span>
Some influential environment variables:
CC C compiler command
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1914,49 +1910,6 @@ fi
</span> as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ac_fn_c_try_run LINENO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ----------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# executables *can* be run.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ac_fn_c_try_run ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { { ac_try="$ac_link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "$ac_try_echo"; } >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (eval "$ac_link") 2>&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { { case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) ac_try_echo=$ac_try;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "$ac_try_echo"; } >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (eval "$ac_try") 2>&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test $ac_status = 0; }; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_retval=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$as_me: program exited with status $ac_status" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$as_me: failed program was:" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sed 's/^/| /' conftest.$ac_ext >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_retval=$ac_status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_set_status $ac_retval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} # ac_fn_c_try_run
</span> ac_configure_args_raw=
for ac_arg
do
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7973,111 +7926,7 @@ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first sqlite3 itself
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check whether --with-sqlite3prefix was given.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test ${with_sqlite3prefix+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- withval=$with_sqlite3prefix; sqlite3prefix=$withval
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$sqlite3prefix" = "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see if it's somewhere like /usr that needs no extra flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_header_compile "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "x$ac_cv_header_sqlite3_h" = xyes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # nope - try pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract the first word of "pkg-config", so it can be a program name with args.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set dummy pkg-config; ac_word=$2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf %s "checking for $ac_word... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test ${ac_cv_path_PKG_CONFIG+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $PKG_CONFIG in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [\\/]* | ?:[\\/]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for as_dir in $PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $as_dir in #(((
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '') as_dir=./ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) as_dir=$as_dir/ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for ac_exec_ext in '' $ac_executable_extensions; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-IFS=$as_save_IFS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -n "$PKG_CONFIG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "$PKG_CONFIG" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "no" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$PKG_CONFIG" = "x" || ! $PKG_CONFIG --exists sqlite3; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "cannot find sqlite3 header" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=$($PKG_CONFIG --libs-only-L --libs-only-other sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3=$($PKG_CONFIG --libs-only-l sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for tclsqlite below
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$mp_sqlite3_dir" != "x"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite3_dir=${mp_sqlite3_dir}/lib/sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check if we have sqlite3ext.h, using the appropriate cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS_OLD="${CPPFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_fn_c_check_header_compile "$LINENO" "sqlite3ext.h" "ac_cv_header_sqlite3ext_h" "$ac_includes_default"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "x$ac_cv_header_sqlite3ext_h" = xyes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf "%s\n" "#define HAVE_SQLITE3EXT_H 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS_OLD}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# check whether trace mode is supported on this platform
</span> ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8211,113 +8060,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
</span> ac_compiler_gnu=$ac_cv_c_compiler_gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLite version in header" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf %s "checking for SQLite version in header... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_cppflags_save=$CPPFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_ldflags_save=$LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_check_sqlite_version_libs_save=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$LDFLAGS $LDFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$LIBS $LIBS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ${mp_cv_sqlite_version+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="-dM $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sqlite3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef SQLITE_VERSION_NUMBER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "SQLITE_VERSION_NUMBER undefined"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ac_fn_c_try_cpp "$LINENO"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_cv_sqlite_version=`fgrep SQLITE_VERSION_NUMBER conftest.i | sed -E 's/[^0-9]*([0-9]+)/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "\"SQLITE_VERSION_NUMBER undefined or sqlite3.h not found\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rm -f conftest.err conftest.i conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${mp_cv_sqlite_version}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "${mp_cv_sqlite_version}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite_version=${mp_cv_sqlite_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLite version at runtime" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf %s "checking for SQLite version at runtime... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ${mp_cv_sqlite_run_version+y}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf %s "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$mp_check_sqlite_version_cppflags_save $CFLAGS_SQLITE3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$cross_compiling" = yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_cv_sqlite_run_version=$mp_cv_sqlite_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sqlite3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main(int argc, char* argv[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int vers = sqlite3_libversion_number();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (argc > 1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%d\n", vers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if ac_fn_c_try_run "$LINENO"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_cv_sqlite_run_version=`./conftest$EXEEXT noisy`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else $as_nop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- as_fn_error $? "\"Failed to run sqlite3_libversion_number test program\"" "$LINENO" 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conftest.$ac_objext conftest.beam conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${mp_cv_sqlite_run_version}" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "${mp_cv_sqlite_run_version}" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$mp_cv_sqlite_run_version" -lt "$mp_cv_sqlite_version"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mp_sqlite_version=$mp_cv_sqlite_run_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=$mp_check_sqlite_version_cppflags_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS=$mp_check_sqlite_version_ldflags_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS=$mp_check_sqlite_version_libs_save
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "#define MP_SQLITE_VERSION $mp_sqlite_version" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$mp_sqlite_version" -lt 3003011; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-printf "%s\n" "#define sqlite3_prepare_v2 sqlite3_prepare" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# check whether trace mode is supported on this platform
</span> { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
printf %s "checking for grep that handles long lines and -e... " >&6; }
if test ${ac_cv_path_GREP+y}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9619,6 +9361,12 @@ TCL_PACKAGE_PATH="$macports_libexec_dir/lib"
</span> INCLUDES="-I.. -I. $INCLUDES"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+## sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_CPPFLAGS=-I`echo ${TCL_SRC_DIR}/pkgs/sqlite3*/compat/sqlite3`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBNAME=`basename ${TCL_SRC_DIR}/pkgs/sqlite3*`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Check if there's an existing DP/MP install too old to upgrade
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;color:#808080;'>index 6768ee66e..4ca6ba94d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,15 +285,6 @@ MP_PLATFORM
</span> ## libcurl
MP_LIBCURL_FLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## sqlite3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MP_SQLITE3_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MP_CHECK_SQLITE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AC_DEFINE_UNQUOTED([MP_SQLITE_VERSION], [$mp_sqlite_version], [SQLite version found])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$mp_sqlite_version" -lt 3003011; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE([sqlite3_prepare_v2], [sqlite3_prepare], [define sqlite3_prepare to sqlite_prepare_v2 if the latter is not available])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # check whether trace mode is supported on this platform
MP_TRACEMODE_SUPPORT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,6 +384,12 @@ AC_SUBST(INTREE_TCLSH)
</span> INCLUDES="-I.. -I. $INCLUDES"
AC_SUBST(INCLUDES)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+## sqlite3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_CPPFLAGS=-I`echo ${TCL_SRC_DIR}/pkgs/sqlite3*/compat/sqlite3`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBNAME=`basename ${TCL_SRC_DIR}/pkgs/sqlite3*`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(SQLITE3_CPPFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+AC_SUBST(SQLITE3_LIBNAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Check if there's an existing DP/MP install too old to upgrade
MP_CHECK_OLDLAYOUT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/config.h.in b/src/config.h.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 2c5af860e..d3e471b1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/config.h.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/config.h.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,9 +159,6 @@
</span> /* Define to 1 if you have the <spawn.h> header file. */
#undef HAVE_SPAWN_H
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* Define to 1 if you have the <sqlite3ext.h> header file. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#undef HAVE_SQLITE3EXT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* Define to 1 if you have the <stdatomic.h> header file. */
#undef HAVE_STDATOMIC_H
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,9 +234,6 @@
</span> /* Lowest non-system-reserved UID. */
#undef MIN_USABLE_UID
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/* SQLite version found */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#undef MP_SQLITE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +262,3 @@
</span>
/* Attribute to mark unused variables */
#undef UNUSED
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* define sqlite3_prepare to sqlite_prepare_v2 if the latter is not available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#undef sqlite3_prepare_v2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/Makefile.in b/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 390c38d25..bf9409f7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +14,8 @@ include ../../Mk/macports.autoconf.mk
</span> # required for strdup(3) on Linux and macOS
CPPFLAGS+=-D_XOPEN_SOURCE=600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS+= ${SQLITE3_CFLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBS+= ${SQLITE3_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS := ${SQLITE3_CPPFLAGS} ${CPPFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBS := ${SQLITE3_LIBS} ${LIBS}
</span>
all:: ${STLIB_NAME}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/entry.c b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b33e3ba7..948ee8aeb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,13 +187,13 @@ reg_entry* reg_entry_open(reg_registry* reg, char* name, char* version,
</span> char* query;
if (strlen(epoch) > 0) {
query = "SELECT id FROM registry.ports "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> "INDEXED BY port_name "
#endif
"WHERE name=? AND version=? AND revision=? AND variants=? AND epoch=?";
} else {
query = "SELECT id FROM registry.ports "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> "INDEXED BY port_name "
#endif
"WHERE name=? AND version=? AND revision=? AND variants=? AND epoch!=?";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -490,7 +490,7 @@ int reg_entry_installed(reg_registry* reg, char* name, reg_entry*** entries,
</span> format = "%s WHERE state='installed'";
} else {
format = "%s "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> "INDEXED BY port_name "
#endif
"WHERE state='installed' AND name='%q'";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,8 +521,8 @@ int reg_entry_owner(reg_registry* reg, char* path, int cs, reg_entry** entry,
</span> char *query = NULL;
asprintf(&query, "SELECT id FROM registry.files %s WHERE (actual_path = ? %s) AND active",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3003013
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3003013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> cs ? "INDEXED BY file_actual" : "INDEXED BY file_actual_nocase",
#else
"",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -588,8 +588,8 @@ sqlite_int64 reg_entry_owner_id(reg_registry* reg, char* path, int cs) {
</span> char *query = NULL;
asprintf(&query, "SELECT id FROM registry.files %s WHERE (actual_path = ? %s) AND active",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3003013
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3003013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> cs ? "INDEXED BY file_actual" : "INDEXED BY file_actual_nocase",
#else
"",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -866,7 +866,7 @@ int reg_entry_unmap(reg_entry* entry, char** files, int file_count,
</span> int result = 1;
sqlite3_stmt* stmt = NULL;
char* query = "DELETE FROM registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> "INDEXED BY file_path "
#endif
"WHERE path=? AND id=?";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1071,7 +1071,7 @@ int reg_entry_activate(reg_entry* entry, char** files, char** as_files,
</span> char* select_query = "SELECT id FROM registry.files WHERE actual_path=? "
"AND active";
char* update_query = "UPDATE registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> /* if the version of SQLite supports it force the usage of the index on
* path, rather than the one on id which has a lot less discriminative
* power and leads to very slow queries. This is needed for the new
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1180,7 +1180,7 @@ int reg_entry_deactivate(reg_entry* entry, char** files, int file_count,
</span> int i;
sqlite3_stmt* stmt = NULL;
char* query = "UPDATE registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> /* if the version of SQLite supports it force the usage of the index on
* path, rather than the one on id which has a lot less discriminative
* power and leads to very slow queries. This is needed for the new
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/file.c b/src/cregistry/file.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 89231ceb8..7ece82d55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/file.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/file.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ reg_file* reg_file_open(reg_registry* reg, char* id, char* name,
</span> sqlite3_stmt* stmt = NULL;
reg_file* file = NULL;
char* query = "SELECT id, path FROM registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> /* if the version of SQLite supports it force the usage of the index on
* path, rather than the one on id which has a lot less discriminative
* power and leads to very slow queries. This is needed for the new
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,7 +245,7 @@ int reg_file_propget(reg_file* file, char* key, char** value,
</span> const char *text;
query = sqlite3_mprintf(
"SELECT %q FROM registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> /* if the version of SQLite supports it force the usage of the index
* on path, rather than the one on id which has a lot less
* discriminative power and leads to very slow queries. This is
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -309,7 +309,7 @@ int reg_file_propset(reg_file* file, char* key, char* value,
</span> char* query;
query = sqlite3_mprintf(
"UPDATE registry.files "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3006004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3006004
</span> /* if the version of SQLite supports it force the usage of the index
* on path, rather than the one on id which has a lot less
* discriminative power and leads to very slow queries. This is
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/sql.c b/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 04ec1ede3..36e9b911d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/sql.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,12 +39,6 @@
</span> #include <tcl.h>
#include <time.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/*** Keep all SQL compatible with SQLite 3.1.3 as shipped with Tiger.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *** (Conditionally doing things a better way when possible based on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *** MP_SQLITE_VERSION is OK.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ***/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /**
* Executes a null-terminated list of queries. Pass it a list of queries, it'll
* execute them. This is mainly intended for initialization, when you have a
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +133,7 @@ int create_tables(sqlite3* db, reg_error* errPtr) {
</span> But the DB would need to be changed back to a non-WAL journal_mode
after doing a SQLITE_CHECKPOINT_RESTART whenever the last writer
closes it. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3022000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3022000
</span> "PRAGMA journal_mode=WAL",
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,7 +307,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> /* we need to update to 1.1, add binary field and index to files
* table */
static char* version_1_1_queries[] = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3002000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3002000
</span> "ALTER TABLE registry.files ADD COLUMN binary BOOL",
#else
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -409,7 +403,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> /* Delete the file_binary index, since it's a low-quality index
* according to https://www.sqlite.org/queryplanner-ng.html#howtofix */
static char* version_1_201_queries[] = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3003000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3003000
</span> "DROP INDEX IF EXISTS registry.file_binary",
#else
"DROP INDEX registry.file_binary",
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -634,7 +628,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> if (sql_version(NULL, -1, version, -1, "1.204") < 0) {
/* add */
static char* version_1_204_queries[] = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3002000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3002000
</span> "ALTER TABLE registry.ports ADD COLUMN cxx_stdlib TEXT",
"ALTER TABLE registry.ports ADD COLUMN cxx_stdlib_overridden INTEGER",
#else
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -728,7 +722,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> "UPDATE registry.metadata SET value = '1.205' WHERE key = 'version'",
"COMMIT",
"PRAGMA fullfsync = 1",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3022000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3022000
</span> "PRAGMA journal_mode=WAL",
#endif
NULL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -749,7 +743,7 @@ int update_db(sqlite3* db, reg_error* errPtr) {
</span> if (sql_version(NULL, -1, version, -1, "1.210") < 0) {
/* add */
static char* version_1_210_queries[] = {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if MP_SQLITE_VERSION >= 3025000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if SQLITE_VERSION_NUMBER >= 3025000
</span> "ALTER TABLE registry.ports RENAME COLUMN negated_variants TO requested_variants",
#else
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/sqlext.c b/src/cregistry/sqlext.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a67b39e9..4c24ea62a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/sqlext.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/sqlext.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,8 @@
</span> #include "vercomp.h"
#include <string.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if HAVE_SQLITE3EXT_H
</span> #include <sqlite3ext.h>
SQLITE_EXTENSION_INIT1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include <sqlite3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span>
/**
* Extension for sqlite3 defining collates being used in our DB. This can be
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/diagnose.tcl b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8caae34ad..c90bdaacc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/diagnose.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,6 @@
</span> # Check for any DYLD_* environment variables
# Check for '.la' in dylib and '.prl'
# Check if installed files are readable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Check for sqlite
</span> # Check for openssl
# Crowd-source more ideas from the mailing-list
# Check if $PATH is first
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +122,6 @@ namespace eval diagnose {
</span> check_for_app curl
check_for_app rsync
check_for_app openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- check_for_app sqlite3
</span> check_macports_location
check_free_space
check_for_x11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/Makefile.in b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ab536f6c..933e9c3d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,8 @@ CPPFLAGS+=-D_XOPEN_SOURCE=600
</span>
pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-CFLAGS+= ${SQLITE3_CFLAGS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBS+= ${SQLITE3_LIBS} ../cregistry/cregistry.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CPPFLAGS := ${SQLITE3_CPPFLAGS} ${CPPFLAGS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBS := ${SQLITE3_LIBS} ${LIBS} ../cregistry/cregistry.a
</span> ifeq (darwin,@OS_PLATFORM@)
SHLIB_LDFLAGS+= -install_name @loader_path/../registry2.0/${SHLIB_NAME}
endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/patches/tcl/sqlite-extern.patch b/vendor/patches/tcl/sqlite-extern.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 000000000..143c67f5d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/patches/tcl/sqlite-extern.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Make the normal sqlite3 API externally visible (until we switch to tdbc...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/tcl/pkgs/sqlite3.36.0/Makefile.in.orig 2022-09-26 15:22:47.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/tcl/pkgs/sqlite3.36.0/Makefile.in 2022-09-26 15:23:22.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PKG_CFLAGS = @PKG_CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TCL_DEFS is not strictly need here, but if you remove it, then you
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # must make sure that configure.in checks for the necessary components
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/tcl/pkgs/sqlite3.36.0/configure.orig 2022-09-07 19:26:45.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/tcl/pkgs/sqlite3.36.0/configure 2022-09-26 23:05:51.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7527,7 +7527,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf %s "checking if ld accepts -single_module flag... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test ${tcl_cv_ld_single_module+y}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tcl8.6.12/pkgs/sqlite3.36.0/Makefile.in b/vendor/tcl8.6.12/pkgs/sqlite3.36.0/Makefile.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 72a147e9f..2172f3af0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tcl8.6.12/pkgs/sqlite3.36.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tcl8.6.12/pkgs/sqlite3.36.0/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,7 +154,7 @@ SHARED_BUILD = @SHARED_BUILD@
</span> INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ -I$(srcdir)/..
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_CFLAGS = @PKG_CFLAGS@ -DSQLITE_API=MODULE_SCOPE -DSQLITE_EXTERN=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PKG_CFLAGS = @PKG_CFLAGS@
</span>
# TCL_DEFS is not strictly need here, but if you remove it, then you
# must make sure that configure.in checks for the necessary components
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tcl8.6.12/pkgs/sqlite3.36.0/configure b/vendor/tcl8.6.12/pkgs/sqlite3.36.0/configure
</span><span style='display:block; white-space:pre;color:#808080;'>index cc39315f6..37a710e71 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tcl8.6.12/pkgs/sqlite3.36.0/configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tcl8.6.12/pkgs/sqlite3.36.0/configure
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7527,7 +7527,7 @@ fi
</span>
fi
# TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -install_name $(pkglibdir)/$(PKG_LIB_FILE)'
</span> { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
printf %s "checking if ld accepts -single_module flag... " >&6; }
if test ${tcl_cv_ld_single_module+y}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/tclsh.in b/vendor/tclsh.in
</span><span style='display:block; white-space:pre;color:#808080;'>index a20f49af6..7ae4b44ac 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/tclsh.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/tclsh.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> #!/bin/sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-LIB_PATH="@TCL_BIN_DIR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIB_PATH="@TCL_BIN_DIR@:@TCL_BIN_DIR@/pkgs/@SQLITE3_LIBNAME@"
</span>
# For macOS
if [ -z "$DYLD_LIBRARY_PATH" ]; then
</pre><pre style='margin:0'>
</pre>