From: stephan <stephan@noemail.net>
Date: Sun, 16 Feb 2025 19:16:09 +0000 (+0000)
Subject: Internal reordering/re-grouping of some configure flags. No functional changes.
X-Git-Tag: major-release~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cc3898e13e903e620f9e471313fc4f290dc5c14;p=thirdparty%2Fsqlite.git

Internal reordering/re-grouping of some configure flags. No functional changes.

FossilOrigin-Name: 0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 4416372951..7d9a9ea84b 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -237,6 +237,28 @@ proc sqlite-config-bootstrap {buildMode} {
       }
     }
 
+    # Options primarily for downstream packagers/package maintainers
+    packaging {
+      {autoconf} {
+        # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704
+        static-shell=1       => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
+      }
+      {*} {
+        # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
+        soname:=legacy
+          => {SONAME for libsqlite3.so. "none", or not using this flag, sets no
+              soname. "legacy" sets it to its historical value of
+              libsqlite3.so.0.  A value matching the glob "libsqlite3.*" sets
+              it to that literal value. Any other value is assumed to be a
+              suffix which gets applied to "libsqlite3.so.",
+              e.g. --soname=9.10 equates to "libsqlite3.so.9.10".}
+        # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2
+        out-implib=0
+          => {Enable use of --out-implib linker flag to generate an
+              "import library" for the DLL}
+      }
+    }
+
     # Options mostly for sqlite's own development
     developer {
       {*} {
@@ -259,32 +281,10 @@ proc sqlite-config-bootstrap {buildMode} {
         linemacros           => {Enable #line macros in the amalgamation}
         dynlink-tools        => {Dynamically link libsqlite3 to certain tools which normally statically embed it}
       }
-      {autoconf} {
-        # --disable-static-shell: https://sqlite.org/forum/forumpost/cc219ee704
-        static-shell=1       => {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
-      }
       {*} {
         dump-defines=0       => {Dump autosetup defines to $::sqliteConfig(dump-defines-txt) (for build debugging)}
       }
     }
-
-    # Options specifically for downstream package maintainers
-    packaging {
-      {*} {
-        # soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
-        soname:=legacy
-          => {SONAME for libsqlite3.so. "none", or not using this flag, sets no
-              soname. "legacy" sets it to its historical value of
-              libsqlite3.so.0.  A value matching the glob "libsqlite3.*" sets
-              it to that literal value. Any other value is assumed to be a
-              suffix which gets applied to "libsqlite3.so.",
-              e.g. --soname=9.10 equates to "libsqlite3.so.9.10".}
-        # out-implib: https://sqlite.org/forum/forumpost/0c7fc097b2
-        out-implib=0
-          => {Enable use of --out-implib linker flag to generate an
-              "import library" for the DLL}
-      }
-    }
   }; # $allOpts
 
   # Filter allOpts to create the set of [options] legal for this build
diff --git a/manifest b/manifest
index 8d78e7da63..1c68ce988d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Re-add\sthe\s--disable-static-shell\sconfigure\sfeature\sto\sthe\sautoconf\sbundle.\sIt\sgot\slost\sin\sthe\sautoconf-to-autosetup\sport,\sas\sreported\sin\s[forum:cc219ee7044|forum\spost\scc219ee7044].
-D 2025-02-16T18:14:05.950
+C Internal\sreordering/re-grouping\sof\ssome\sconfigure\sflags.\sNo\sfunctional\schanges.
+D 2025-02-16T19:16:09.834
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -50,7 +50,7 @@ F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e
 F autosetup/jimsh0.c 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl cef1e0aa0f2dee2042af66f28c97a9445f84d55d858ba9db4f6116846a1a325f
-F autosetup/sqlite-config.tcl 671b79027b162b9d945367d288cf82a9f6c7bd834c7b6812a24084f9ecf763ea
+F autosetup/sqlite-config.tcl e1d65cc632e1de94ff39618ac82b649f2062f674ca36dae78ab3573cab096761
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
@@ -2207,8 +2207,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 9ffe94d2ea0b3679c3d2657e2c3b67f84c09e9bcbbe0a13c76d58858df367d1b
-R 98921f713d8fbfbddc4ac85a3af675c9
+P 47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24
+R 969cb5a3f034581c276e9924fba081e4
 U stephan
-Z e6ed162aea3b5e30451735f568dc1c13
+Z e3597b532b91bea5961ce10f269dd158
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dbd9d9bc69..70121ce06d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47e817f663468ce08dae4965b7ecacefb921a77398ec958b35bf5cedee767e24
+0c085a5ab51d6ac793a147a865bd086b1a6a572932c251b38d3854e4ea802f8d