Remove LDFLAGS_LIBZ from sqlite3.pc.in (pkg-config) because it's not needed by the...

FossilOrigin-Name: e03c564aff6e3ac558f17670bfdd5fc129a8d33ec50975af843973152483e3fa

diff --git a/auto.def b/auto.def
index 97a3179ae18f8c9b56c2fe45b9aa819ca6442987..0f914a41383efc02867d53cb053811571f0efe38 100644 (file)
--- a/auto.def
+++ b/auto.def
@@ -139,7 +139,6 @@ set flags {
   load-extension=1     => {Disable loading of external extensions}
   math=1               => {Disable math functions}
   json=1               => {Disable JSON functions}
-  all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
   memsys5              => {Enable MEMSYS5}
   memsys3              => {Enable MEMSYS3}
   fts3                 => {Enable the FTS3 extension}
@@ -149,6 +148,7 @@ set flags {
   geopoly              => {Enable the GEOPOLY extension}
   rtree                => {Enable the RTREE extension}
   session              => {Enable the SESSION extension}
+  all                  => {Enable FTS4, FTS5, Geopoly, RTree, Sessions}
   # </lib-feature>
   # <tcl>
   with-tclsh:PATH      => {Full pathname of tclsh to use}
@@ -392,7 +392,10 @@ proj-check-rpath; # Determine proper rpath-handling flags.
 
 proj-define-if-opt-truthy shared ENABLE_SHARED "Build shared library?"
 
-proj-define-if-opt-truthy static ENABLE_STATIC "Build static library?"
+if {![proj-define-if-opt-truthy static ENABLE_STATIC \
+        "Build static library?"]} {
+  proj-warn "Static lib build may be implicitly re-activated by other components, e.g. some test apps."
+}
 
 proj-define-if-opt-truthy amalgamation USE_AMALGAMATION "Use amalgamation for builds?"
 
@@ -474,7 +477,7 @@ proc sqlite-check-tcl {} {
       proj-fatal "TCL shell $with_tclsh is not executable"
     } else {
       define TCLSH_CMD $with_tclsh
-      msg-result "Using tclsh: $with_tclsh"
+      #msg-result "Using tclsh: $with_tclsh"
     }
     if {$use_tcl} {
       if {[catch {exec $with_tclsh $top_srcdir/tool/find_tclconfig.tcl} result] == 0} {

diff --git a/main.mk b/main.mk
index 75dbd7e7284a431001728ae6243aebcb44430628..409f9ac8f135dcf9075abb69274f56704e864fd0 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -326,7 +326,8 @@ T.link.shared = $(T.link) $(LDFLAGS.shobj)
 # results in building libsqlite3.so, compiles sqlite3.c directly, or
 # links in either of $(LIBOBJSO) or $(LIBOBJS1).  Note that these
 # flags are for the target build platform, not necessarily localhost.
-# i.e. it should be used with $(T.cc.sqlite) or $(T.link) but not $(B.cc).
+# i.e. it should be used with $(T.cc.sqlite) or $(T.link) but not
+# $(B.cc).
 #
 LDFLAGS.libsqlite3 = \
   $(LDFLAGS.rpath) $(LDFLAGS.pthread) \

diff --git a/manifest b/manifest
index 88d0db9088158c909e89b342e2919689fd610aa0..40810f458f81b340772fe35f205b6c03409627a5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssome\sdead\sauto.def\scode.\sLink\stclsqlite3\sshell\sagainst\sthe\s.so\sinstead\sof\s.a,\sanalog\sto\s[45315f8f275d].\sMove\ssome\sheader\sfile\stests\swhich\sare\sonly\sneeded\sfor\sjimsh\sinto\sthe\sjimsh\scompilability\scheck\sblock.
-D 2024-10-29T03:29:45.408
+C Remove\sLDFLAGS_LIBZ\sfrom\ssqlite3.pc.in\s(pkg-config)\sbecause\sit's\snot\sneeded\sby\sthe\slibrary,\sonly\sthe\sshell.\sRe-enable\sthe\snotice\sabout\s--disable-static\sonly\sbeing\spartially\strue.
+D 2024-10-29T04:21:11.440
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md b6e6c1baf38e4339bd3f1e0e5e5bfd0a9a93d133360691b2785c2d4b2f2dcec2
@@ -13,7 +13,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
-F auto.def 30e263662f55d045994aae89b9e8d2afd3476edba679165dec776d96ed5d7e21
+F auto.def 7f3da911883d21c53462b9a79259c9551d971a8cdc9bbbd11a7e79efaa7b758b
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -697,7 +697,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk f1a7ddc6e41c08bc3d61fe7ec50a669ca5688bfab7e8b747e1150b54bccaf8cb
+F main.mk 35c8565133e6afc4219654a8339cf617f8d9f40b3e9b6a598a2e9782b8a4eee5
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -706,7 +706,7 @@ F mptest/mptest.c aa41ace6dbc5050d76b02548d3521e6bbccae4f0
 F mptest/multiwrite01.test dab5c5f8f9534971efce679152c5146da265222d
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc
-F sqlite3.pc.in 0977c03a4da7c4204bd60e784a0efb8d51a190448aba78a4e973fe7192bdaf03
+F sqlite3.pc.in 2d5c88643679fc199dafc9afb6ea8868ea3192d941c2e57dbe06395149d892ba
 F sqlite_cfg.h.in be1d075cf77134d53fdf5cc2c0919842e7e02a648c66a56e735af25ccdcaff91
 F src/alter.c aa93e37e4a36a0525bbb2a2aeda20d2018f0aa995542c7dc658e031375e3f532
 F src/analyze.c 9a8b67239d899ac12289db5db3f5bfe7f7a0ad1277f80f87ead1d048085876eb
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c3b624e2a903f0c975bc8b7288b98616a4a22b2a574738d1f578bfad1d6d8b91
-R 1fbe3bfca5dee7f1b439640106ed2db7
+P 9a259026ae2dce5d60b80bd7d662a6e73734e51056f4a4226c3fa5ac636b5e3a
+R faa87ee569d92cfc3e69ecb8ae88e292
 U stephan
-Z 39268a9790bf3e3d8cfe8a98d615a386
+Z 1c510488e46aaa36e3e65a77adda5034
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b5a800f0ab5f238f031cc02d542668f072fb42f9..4c7174f1421dc105cb91df92ec1e473d1b6dd646 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9a259026ae2dce5d60b80bd7d662a6e73734e51056f4a4226c3fa5ac636b5e3a
+e03c564aff6e3ac558f17670bfdd5fc129a8d33ec50975af843973152483e3fa

diff --git a/sqlite3.pc.in b/sqlite3.pc.in
index a9f941b1e40d63065c13507196ca03d5e283d341..97f3c1a60db3696f6617170f4430229b33a30a11 100644 (file)
--- a/sqlite3.pc.in
+++ b/sqlite3.pc.in
@@ -9,5 +9,5 @@ Name: SQLite
 Description: SQL database engine
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lsqlite3
-Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@
+Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ICU@
 Cflags: -I${includedir}