From: stephan <stephan@noemail.net>
Date: Thu, 30 Jan 2025 12:19:30 +0000 (+0000)
Subject: Minor code de-duplication across the top-level auto.def and autoconf/auto.def.
X-Git-Tag: version-3.49.0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=73dcf45a3d9bcd7da13dffa59b090de3dcfd10bb;p=thirdparty%2Fsqlite.git

Minor code de-duplication across the top-level auto.def and autoconf/auto.def.

FossilOrigin-Name: 3c990d77cb83ab371d92c97e0528f790ab6126c60f48ff77e48bd166d7834cf0
---

diff --git a/auto.def b/auto.def
index dade81613f..52c758850c 100644
--- a/auto.def
+++ b/auto.def
@@ -275,8 +275,6 @@ sqlite-handle-load-extension
 sqlite-handle-math
 sqlite-handle-icu
 sqlite-handle-emsdk
-sqlite-handle-common-feature-flags
-sqlite-show-feature-flags
 sqlite-process-dot-in-files
 sqlite-post-config-validation
 sqlite-dump-defines
diff --git a/autoconf/auto.def b/autoconf/auto.def
index 0f36e733ca..12eb3d75c3 100644
--- a/autoconf/auto.def
+++ b/autoconf/auto.def
@@ -90,8 +90,6 @@ sqlite-handle-line-editing
 sqlite-handle-load-extension
 sqlite-handle-math
 sqlite-handle-icu
-sqlite-handle-common-feature-flags
-sqlite-show-feature-flags
 
 define ENABLE_LIB_SHARED [opt-bool shared]
 define ENABLE_LIB_STATIC [opt-bool static]
diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 90e4d7dbcc..9f300e317d 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -232,6 +232,10 @@ proc sqlite-setup-default-cflags {} {
   # from the legacy build and was missing the 3.48.0 release (the
   # initial Autosetup port).
   # https://sqlite.org/forum/forumpost/9801e54665afd728
+  #
+  # If any configure flags for features are in conflict with
+  # CFLAGS-specified feature flags, all bets are off.  There are no
+  # guarantees about which one will take precedence.
   foreach cf [get-define CFLAGS ""] {
     switch -glob -- $cf {
       -DSQLITE_OMIT* -
@@ -307,8 +311,9 @@ proc sqlite-handle-common-feature-flags {} {
 }
 
 #########################################################################
-# Show the final feature flag sets.
-proc sqlite-show-feature-flags {} {
+# Remove duplicates from the final feature flag sets and show them to
+# the user.
+proc sqlite-finalize-feature-flags {} {
   set oFF [get-define OPT_FEATURE_FLAGS]
   if {"" ne $oFF} {
     define OPT_FEATURE_FLAGS [lsort -unique $oFF]
@@ -319,7 +324,6 @@ proc sqlite-show-feature-flags {} {
     define OPT_SHELL [lsort -unique $oFF]
     msg-result "Shell options: [get-define OPT_SHELL]"
   }
-  #parray ::sqliteConfig
 }
 
 ########################################################################
@@ -858,13 +862,21 @@ proc sqlite-handle-math {} {
 }
 
 ########################################################################
-# Generate the configure-process output file(s).
+# Perform some late-stage work and generate the configure-process
+# output file(s).
 proc sqlite-process-dot-in-files {} {
   ########################################################################
   # When cross-compiling, we have to avoid using the -s flag to
-  # /usr/bin/install: https://sqlite.org/forum/forumpost/9a67df63eda9925c
+  # /usr/bin/install:
+  # https://sqlite.org/forum/forumpost/9a67df63eda9925c
   define IS_CROSS_COMPILING $::sqliteConfig(is-cross-compiling)
 
+  # Finish up handling of the various feature flags here because it's
+  # convenient for both the canonical build and autoconf bundles that
+  # it be done here.
+  sqlite-handle-common-feature-flags
+  sqlite-finalize-feature-flags
+
   ########################################################################
   # "Re-export" the autoconf-conventional --XYZdir flags into something
   # which is more easily overridable from a make invocation. See the docs
diff --git a/manifest b/manifest
index 736757ee45..ce04412697 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sa\stest\scase\sthat\s(intentionally)\sdoes\suse-after-free,\sas\sit\sdoes\noccasionally\scause\sproblems\seven\sfor\snon-sanitizer\sbuilds.
-D 2025-01-30T12:01:24.848
+C Minor\scode\sde-duplication\sacross\sthe\stop-level\sauto.def\sand\sautoconf/auto.def.
+D 2025-01-30T12:19:30.898
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -14,13 +14,13 @@ F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F art/sqlite370.svg 40b7e2fe8aac3add5d56dd86ab8d427a4eca5bcb3fe4f8946cb3794e1821d531
-F auto.def caf7cca9c235fc6a3d7639e00eb75972d9bf8527717498b9fa1d7112d50b5720
+F auto.def e7e92090c98aeb0174d29988c259834eb1b71ae1ea927015c3ef300f6f9b68ae
 F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
 F autoconf/Makefile.in 56697ad25ecf23afa317148b06bdc14f85960b42e5ec434ac1ba87f63a3cb789
 F autoconf/Makefile.msc ffff61fe851443015ddb6600ab69a9df503cfec25459b336be7ba8c9a9e473f8
 F autoconf/README.first f1d3876e9a7852c22f275a6f06814e64934cecbc0b5b9617d64849094c1fd136
 F autoconf/README.txt 7f01dc3915e2d68f329011073662369e62a0938a2c69398807823c57591cb288
-F autoconf/auto.def 623e0d2339cbccc86b1c5e58d65702dc91a9fec4843a4c6198139e248579858e
+F autoconf/auto.def 23bc095a3890c0ca334abf7ef67d1c8af4c22c12832bcc738015e868d54fe9d7
 F autoconf/tea/Makefile.in ba0556fee8da09c066bad85a4457904e46ee2c2eabaa309c0e83a78f2f151a8e
 F autoconf/tea/README.txt 61e62e519579e4a112791354d6d440f8b51ea6db3b0bab58d59f29df42d2dfe3
 F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c d40e381ea4526a067590e7b91bd4b2efa6d4980d286f908054c647b3df4aee14
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl 9adf1539673cef15bff862d9360b479e6920cc2c0d85de707b0ba31c04ce4531
-F autosetup/sqlite-config.tcl e5de87d000ef5fa4ed78663c74688bbdd989b59bf5bae2aabaff65a502b0ec80
+F autosetup/sqlite-config.tcl 00af5b9d94d580367bf01984b86397e8d35b74090427def9591a54ded0e1a287
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2209,8 +2209,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 ec71d9dcd582188d7fb4ab945187de1023eaaecffeeb2903a6fcc49650bd21e9
-R 7b8d1f95b47e47a5d559070e34819714
-U drh
-Z 470d847ca31236034508764b46198386
+P 23c7d5bea351c04785153ddb30e19c1236db9d11054ab8229893531026b53655
+R ba9c9d617d2000ba71d01bbdea8f462f
+U stephan
+Z 94fb984dd769f6092f86cd16435effad
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 793cb84d2a..dcfee8e9d0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23c7d5bea351c04785153ddb30e19c1236db9d11054ab8229893531026b53655
+3c990d77cb83ab371d92c97e0528f790ab6126c60f48ff77e48bd166d7834cf0