From: stephan <stephan@noemail.net>
Date: Mon, 2 Dec 2024 14:14:30 +0000 (+0000)
Subject: Reformulate [9e09d5d6] so that memsys5 shows up in the late-config summary as being... 
X-Git-Tag: major-relase~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed7fe45c7c035e9b5c97d67885c73ee8409f6273;p=thirdparty%2Fsqlite.git

Reformulate [9e09d5d6] so that memsys5 shows up in the late-config summary as being enabled and does the right thing if both --debug and --memsys3 are used.

FossilOrigin-Name: 447db1cd0a6575432996e9735e78bbb09c83827c5e3080339b34df176ab86af0
---

diff --git a/auto.def b/auto.def
index ba8b1adbf7..e4ddbbd46f 100644
--- a/auto.def
+++ b/auto.def
@@ -519,7 +519,8 @@ proj-define-for-opt linemacros AMALGAMATION_LINE_MACROS \
 msg-checking "SQLITE_DEBUG build? "
 proj-if-opt-truthy debug {
   define SQLITE_DEBUG 1
-  define TARGET_DEBUG {-g -DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_MEMSYS5 -O0 -Wall}
+  define TARGET_DEBUG {-g -DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0 -Wall}
+  proj-opt-set memsys5
   msg-result yes
 } {
   define TARGET_DEBUG {-DNDEBUG}
diff --git a/manifest b/manifest
index 2bfdd7a1e1..a00285bf1b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sMEMSYS5\swith\sthe\s--dev\sconfigure\soption.
-D 2024-12-02T13:47:53.444
+C Reformulate\s[9e09d5d6]\sso\sthat\smemsys5\sshows\sup\sin\sthe\slate-config\ssummary\sas\sbeing\senabled\sand\sdoes\sthe\sright\sthing\sif\sboth\s--debug\sand\s--memsys3\sare\sused.
+D 2024-12-02T14:14:30.676
 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 411c5b5538d4890c601eb0bf3aa0e401e507209c3aaacde063977b6f0dafe69f
+F auto.def 6de760c0b88ace5550403544a2eb83eb6834be99997c845d824c19774e056dc5
 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 7aef0b93050cdb79cae68361e84047cea2e8e7251d0581ce917da03352bb1f16
-R e48a17285a227782715f071b22aa748e
-U drh
-Z afc76fb7a8a09f7eb558217a5434a8b5
+P 9e09d5d60ac91423e1dec1169e9eb60a531f84261b48490c550cf4529540e6dc
+R d9d8b14ef1a08757ec20208f0b613d4c
+U stephan
+Z 4b6795ed2210994cf6151e4f8f333a77
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index ce0f809bc6..0d8e1c2577 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9e09d5d60ac91423e1dec1169e9eb60a531f84261b48490c550cf4529540e6dc
+447db1cd0a6575432996e9735e78bbb09c83827c5e3080339b34df176ab86af0