From: stephan <stephan@noemail.net>
Date: Thu, 19 Dec 2024 14:09:35 +0000 (+0000)
Subject: configure script: only set the SQLITE_TEMP_STORE feature flag if --with-tempstore... 
X-Git-Tag: major-relase~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=166f4eb5cf5ae25ba203f860e48efb9a258bf1f6;p=thirdparty%2Fsqlite.git

configure script: only set the SQLITE_TEMP_STORE feature flag if --with-tempstore is explicitly set, to avoid colliding with that flag being set by other means via the test fixture scripts.

FossilOrigin-Name: c7839b80972fb31df6ac81af38cf6d04c9542714c20fbaa7457c1eaf955f9222
---

diff --git a/auto.def b/auto.def
index c52ce44986..c9aa0cb9d1 100644
--- a/auto.def
+++ b/auto.def
@@ -864,22 +864,27 @@ proj-if-opt-truthy threadsafe {
 ########################################################################
 # Do we want temporary databases in memory?
 #
-apply {{} {
-  set ts [opt-val with-tempstore no]
-  set tsn 1
-  msg-checking "Use an in-RAM database for temporary tables? "
-  switch -exact -- $ts {
-    never  { set tsn 0 }
-    no     { set tsn 1 }
-    yes    { set tsn 2 }
-    always { set tsn 3 }
-    default {
-      user-error "Invalid --with-tempstore value '$ts'. Use one of: never, no, yes, always"
+# The test fixture likes to set SQLITE_TEMP_STORE on its own, so do
+# not set that feature flag unless it was explicitly provided to the
+# configure script.
+if {[proj-opt-was-provided with-tempstore]} {
+  apply {{} {
+    set ts [opt-val with-tempstore no]
+    set tsn 1
+    msg-checking "Use an in-RAM database for temporary tables? "
+    switch -exact -- $ts {
+      never  { set tsn 0 }
+      no     { set tsn 1 }
+      yes    { set tsn 2 }
+      always { set tsn 3 }
+      default {
+        user-error "Invalid --with-tempstore value '$ts'. Use one of: never, no, yes, always"
+      }
     }
-  }
-  msg-result $ts
-  sqlite-add-feature-flag -DSQLITE_TEMP_STORE=$tsn
-}}
+    msg-result $ts
+    sqlite-add-feature-flag -DSQLITE_TEMP_STORE=$tsn
+  }}
+}
 
 ########################################################################
 # sqlite-check-line-editing jumps through proverbial hoops to try to
diff --git a/manifest b/manifest
index adf5f72696..476bc293f5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sMicrosoft\smakefile\sso\sthat\sit\sdoes\snot\sset\sSQLITE_TEMP_STORE\nunnecessarily.
-D 2024-12-19T14:08:06.761
+C configure\sscript:\sonly\sset\sthe\sSQLITE_TEMP_STORE\sfeature\sflag\sif\s--with-tempstore\sis\sexplicitly\sset,\sto\savoid\scolliding\swith\sthat\sflag\sbeing\sset\sby\sother\smeans\svia\sthe\stest\sfixture\sscripts.
+D 2024-12-19T14:09:35.677
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,7 +14,7 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def f2876c94403be1055db47273dde33e8fea0998b1c1d36a386f76698919ea36ad
+F auto.def 63dfbbc58b041d1c5c516f31a02679cce8d79123c89ad87fd2783f4ef26dedbb
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
@@ -2202,8 +2202,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 e2188a3edf3576963b45e9ffe6ef53e2a85aa68ea3dfb3243b4943d06ffaf829
-R fca299ca2e778dc1f6b849301fe4d4fb
-U drh
-Z 5ca71bb0728c1324bb94823ee29eaeef
+P f9b92f9513def690311a5ca46b68cab02bedec7984960d44e7dea5c2d196725a
+R 1677c650b894e550921b2c6865a336f8
+U stephan
+Z 945c85e044fc70c85b4eacbaf56b56af
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index bc9b17953b..7c5ebd691d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9b92f9513def690311a5ca46b68cab02bedec7984960d44e7dea5c2d196725a
+c7839b80972fb31df6ac81af38cf6d04c9542714c20fbaa7457c1eaf955f9222