From: stephan <stephan@noemail.net>
Date: Fri, 21 Mar 2025 16:06:16 +0000 (+0000)
Subject: Proxy configure's msg-debug with proc-debug, which works the same except that it... 
X-Git-Tag: major-release~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb6997fbac02e942ac19d2baa77571df2414b942;p=thirdparty%2Fsqlite.git

Proxy configure's msg-debug with proc-debug, which works the same except that it prepends the name of the calling proc to the debug message. No functional changes.

FossilOrigin-Name: f0298c773d3490ad3a5b53d2ceeff1bd90e1a7bb5deeba2d24f681ec1bc10510
---

diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl
index ba5427b6a5..3698c8c1f4 100644
--- a/autosetup/proj.tcl
+++ b/autosetup/proj.tcl
@@ -1365,3 +1365,12 @@ proc proj-env-file {flag {dflt ""}} {
 proc proj-get-env {var {dflt ""}} {
   return [get-env $var [proj-env-file $var $dflt]]
 }
+
+########################################################################
+# @proj-current-proc-name
+#
+# Returns the name of the _calling_ proc from $lvl levels up the call
+# stack. Derived from: https://stackoverflow.com/questions/10012851
+proc proj-current-proc-name {{lvl 1}} {
+  uplevel $lvl {lindex [info level 0] 0}
+}
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 9461e7f89d..48155af496 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -481,6 +481,13 @@ proc msg-debug {msg} {
     puts stderr [proj-bold "** DEBUG: $msg"]
   }
 }
+########################################################################
+# A [msg-debug] proxy which prepends the name of the current proc to
+# the debug message. It is not legal to call this from the global
+# scope.
+proc proc-debug {msg} {
+  msg-debug "\[[proj-current-proc-name 2]\]: $msg"
+}
 
 ########################################################################
 # Sets up the SQLITE_AUTORECONFIG define.
@@ -797,7 +804,7 @@ proc sqlite-handle-soname {} {
       }
     }
   }
-  msg-debug "soname=$soname"
+  proc-debug "soname=$soname"
   if {[proj-check-soname $soname]} {
     define LDFLAGS_LIBSQLITE3_SONAME [get-define LDFLAGS_SONAME_PREFIX]$soname
     msg-result "Setting SONAME using: [get-define LDFLAGS_LIBSQLITE3_SONAME]"
@@ -966,7 +973,7 @@ proc sqlite-get-readline-dir-list {} {
   foreach d $dirs {
     if {[file isdir $d]} {lappend rv $d}
   }
-  #msg-debug "sqlite-get-readline-dir-list dirs=$rv"
+  #proc-debug "dirs=$rv"
   return $rv
 }
 
@@ -1118,7 +1125,7 @@ proc sqlite-check-line-editing {} {
       lappend subdirs include
       set rlInc [proj-search-for-header-dir readline.h \
                    -dirs $dirs -subdirs $subdirs]
-      #msg-debug "rlInc=$rlInc"
+      #proc-debug "rlInc=$rlInc"
       if {"" ne $rlInc} {
         if {[string match */readline $rlInc]} {
           set rlInc [file dirname $rlInc]; # CLI shell: #include <readline/readline.h>
@@ -1143,7 +1150,7 @@ proc sqlite-check-line-editing {} {
   set rlLib ""
   if {"" ne $rlInc} {
     set rlLib [opt-val with-readline-ldflags]
-    #msg-debug "rlLib=$rlLib"
+    #proc-debug "rlLib=$rlLib"
     if {$rlLib eq "auto" || $rlLib eq ""} {
       set rlLib ""
       set libTerm ""
@@ -1780,14 +1787,14 @@ proc sqlite-check-tcl {} {
   if {"prefix" eq $with_tcl} {
     set with_tcl [get-define prefix]
   }
-  msg-debug "sqlite-check-tcl: use_tcl ${use_tcl}"
-  msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
-  msg-debug "sqlite-check-tcl: with_tcl=$with_tcl"
+  proc-debug "use_tcl ${use_tcl}"
+  proc-debug "with_tclsh=${with_tclsh}"
+  proc-debug "with_tcl=$with_tcl"
   if {"" eq $with_tclsh && "" eq $with_tcl} {
     # If neither --with-tclsh nor --with-tcl are provided, try to find
     # a workable tclsh.
     set with_tclsh [proj-first-bin-of tclsh9.0 tclsh8.6 tclsh]
-    msg-debug "sqlite-check-tcl: with_tclsh=${with_tclsh}"
+    proc-debug "with_tclsh=${with_tclsh}"
   }
 
   set doConfigLookup 1 ; # set to 0 to test the tclConfig.sh-not-found cases
diff --git a/manifest b/manifest
index 07acc0acad..b02a1c56e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Teach\sthe\sconfigure\sscript\sto\sbe\sable\sfind\sa\sdefault\sinstallation\sof\slibreadline\son\sHaiku\sOS.
-D 2025-03-20T13:41:08.243
+C Proxy\sconfigure's\smsg-debug\swith\sproc-debug,\swhich\sworks\sthe\ssame\sexcept\sthat\sit\sprepends\sthe\sname\sof\sthe\scalling\sproc\sto\sthe\sdebug\smessage.\sNo\sfunctional\schanges.
+D 2025-03-21T16:06:16.983
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -49,8 +49,8 @@ F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1d
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
-F autosetup/proj.tcl bdf0489d4ce8110fc1d4a09b1e2e274e50dd51711637b55c7c63a6a7ecec2aa5
-F autosetup/sqlite-config.tcl 4f4f666382c68a01617a4b75cb7cfc2690f49760d683836332bbee9c5bd6d47b
+F autosetup/proj.tcl 2753b2ca95d3f91d4facc447b61a3090a0aea86a41c33ef8ad9db8d0bb0d464d
+F autosetup/sqlite-config.tcl 27ac8b7634a4d54e93a61bc13d56985b890e58e24c77c4bab93b53a5d1843973
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2215,8 +2215,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 346cf9794c6ce82ac32f7ccabc67240309306626709951593720abd198b103e3
-R a0ddd543c9b9478028e92dd9961c6514
+P 260e9884118172ef76457a34042ace301f20abab4ced172f6b6135010c446a68
+R e20098aa98dd2dc6f5c975996659e451
 U stephan
-Z 2ec32e826afbcab9328d3272b3136b96
+Z eacd552cb3abab15f251e0a9034bd2ad
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cdf4059c1b..c77f3fbe4b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-260e9884118172ef76457a34042ace301f20abab4ced172f6b6135010c446a68
+f0298c773d3490ad3a5b53d2ceeff1bd90e1a7bb5deeba2d24f681ec1bc10510