<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/b7fdcbbc309a33ddf6d96ccf7e58754625b94480">https://github.com/macports/macports-base/commit/b7fdcbbc309a33ddf6d96ccf7e58754625b94480</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 b7fdcbbc separate sqlite3 LIBS and LDFLAGS
</span>b7fdcbbc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b7fdcbbc309a33ddf6d96ccf7e58754625b94480
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 24 03:55:06 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> separate sqlite3 LIBS and LDFLAGS
</span>---
Mk/macports.autoconf.mk.in | 2 +-
aclocal.m4 | 15 +++++++++++----
configure | 14 +++++++++++---
3 files changed, 23 insertions(+), 8 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 6319652e..3ed36f1a 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;'>@@ -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@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SQLITE3_LIBS = @LDFLAGS_SQLITE3@ @LIBS_SQLITE3@
</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 d6125c1e..d4809613 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;'>@@ -915,7 +915,7 @@ AC_DEFUN([MP_LIBCURL_FLAGS],[
</span> #
# Results:
# defines some help strings.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# sets CFLAGS_SQLITE3 and LDFLAGS_SQLITE3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sets CFLAGS_SQLITE3, LIBS_SQLITE3 and LDFLAGS_SQLITE3
</span> #---------------------------------------
AC_DEFUN([MP_SQLITE3_FLAGS],[
# first sqlite3 itself
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -925,7 +925,8 @@ AC_DEFUN([MP_SQLITE3_FLAGS],[
</span>
if test "x$sqlite3prefix" = "x"; then
# see if it's somewhere like /usr that needs no extra flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3=""
</span> AC_CHECK_HEADER(sqlite3.h, [],[
# nope - try pkg-config
AC_PATH_PROG([PKG_CONFIG], [pkg-config])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -933,7 +934,8 @@ AC_DEFUN([MP_SQLITE3_FLAGS],[
</span> AC_MSG_ERROR([cannot find sqlite3 header])
else
CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=$($PKG_CONFIG --libs sqlite3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3=$($PKG_CONFIG --libs-only-L --libs-only-other sqlite3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3=$($PKG_CONFIG --libs-only-l sqlite3)
</span> # for tclsqlite below
mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
if test "x$mp_sqlite3_dir" != "x"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -943,7 +945,8 @@ AC_DEFUN([MP_SQLITE3_FLAGS],[
</span> ])
else
CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib"
</span> fi
# check if we have sqlite3ext.h, using the appropriate cppflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -954,6 +957,7 @@ AC_DEFUN([MP_SQLITE3_FLAGS],[
</span>
AC_SUBST(CFLAGS_SQLITE3)
AC_SUBST(LDFLAGS_SQLITE3)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_SUBST(LIBS_SQLITE3)
</span> ])
dnl This macro tests if the compiler supports GCC's
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1194,8 +1198,10 @@ AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
</span>
mp_check_sqlite_version_cppflags_save=$CPPFLAGS
mp_check_sqlite_version_ldflags_save=$LDFLAGS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp_check_sqlite_version_libs_save=$LIBS
</span> CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
LDFLAGS="$LDFLAGS $LDFLAGS_SQLITE3"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS $LIBS_SQLITE3"
</span>
AC_CACHE_VAL([mp_cv_sqlite_version], [
AC_PREPROC_IFELSE(
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1246,6 +1252,7 @@ AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
</span>
CPPFLAGS=$mp_check_sqlite_version_cppflags_save
LDFLAGS=$mp_check_sqlite_version_ldflags_save
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$mp_check_sqlite_version_libs_save
</span> ])
#------------------------------------------------------------------------
<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 863befd8..c5102341 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;'>@@ -687,6 +687,7 @@ TRACEMODE_SUPPORT
</span> EGREP
GREP
CPP
<span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBS_SQLITE3
</span> LDFLAGS_SQLITE3
CFLAGS_SQLITE3
PKG_CONFIG
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7987,7 +7988,8 @@ fi
</span>
if test "x$sqlite3prefix" = "x"; then
# see if it's somewhere like /usr that needs no extra flags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3=""
</span> ac_fn_c_check_header_compile "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
if test "x$ac_cv_header_sqlite3_h" = xyes
then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8044,7 +8046,8 @@ fi
</span> as_fn_error $? "cannot find sqlite3 header" "$LINENO" 5
else
CFLAGS_SQLITE3=$($PKG_CONFIG --cflags sqlite3)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3=$($PKG_CONFIG --libs sqlite3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3=$($PKG_CONFIG --libs-only-L --libs-only-other sqlite3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3=$($PKG_CONFIG --libs-only-l sqlite3)
</span> # for tclsqlite below
mp_sqlite3_dir=$($PKG_CONFIG --variable=prefix sqlite3)
if test "x$mp_sqlite3_dir" != "x"; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8056,7 +8059,8 @@ fi
</span>
else
CFLAGS_SQLITE3="-I${sqlite3prefix}/include"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS_SQLITE3="-lsqlite3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib"
</span> fi
# check if we have sqlite3ext.h, using the appropriate cppflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8075,6 +8079,7 @@ fi
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -8216,8 +8221,10 @@ printf %s "checking for SQLite version in header... " >&6; }
</span>
mp_check_sqlite_version_cppflags_save=$CPPFLAGS
mp_check_sqlite_version_ldflags_save=$LDFLAGS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp_check_sqlite_version_libs_save=$LIBS
</span> CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
LDFLAGS="$LDFLAGS $LDFLAGS_SQLITE3"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS="$LIBS $LIBS_SQLITE3"
</span>
if test ${mp_cv_sqlite_version+y}
then :
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8301,6 +8308,7 @@ printf "%s\n" "${mp_cv_sqlite_run_version}" >&6; }
</span>
CPPFLAGS=$mp_check_sqlite_version_cppflags_save
LDFLAGS=$mp_check_sqlite_version_ldflags_save
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$mp_check_sqlite_version_libs_save
</span>
printf "%s\n" "#define MP_SQLITE_VERSION $mp_sqlite_version" >>confdefs.h
</pre><pre style='margin:0'>
</pre>