From: stephan Date: Sat, 22 Feb 2025 14:53:31 +0000 (+0000) Subject: Random non-functional configure script cleanups. X-Git-Tag: major-release~242^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df5d5faebe6a239b919b7e532509c7b89104c8c8;p=thirdparty%2Fsqlite.git Random non-functional configure script cleanups. FossilOrigin-Name: 2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883 --- diff --git a/autosetup/proj.tcl b/autosetup/proj.tcl index f228dce217..52b410fd6a 100644 --- a/autosetup/proj.tcl +++ b/autosetup/proj.tcl @@ -379,7 +379,6 @@ proc proj-opt-was-provided {key} { # # Returns $val. proc proj-opt-set {flag {val 1}} { - global autosetup if {$flag ni $::autosetup(options)} { # We have to add this to autosetup(options) or else future calls # to [opt-bool $flag] will fail validation of $flag. diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index ab9bf83902..cd38d0c179 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -1337,12 +1337,13 @@ proc sqlite-handle-out-implib {} { } ######################################################################## -# [define] SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of -# "make install" rules to use. The makefile is tasked with with -# providing rules named install-dll-NAME which runs the installation -# for that set, as well as providing a rule named install-dll which -# resolves to install-dll-NAME (perhaps indirectly, depending on -# whether the DLL is (de)activated). +# [define]s SQLITE_DLL_INSTALL_RULES to a symbolic name of a set of +# "make install" rules to use for installation of the DLL +# deliverable. The makefile is tasked with with providing rules named +# install-dll-NAME which runs the installation for that set, as well +# as providing a rule named install-dll which resolves to +# install-dll-NAME (perhaps indirectly, depending on whether the DLL +# is (de)activated). # # The default value is "unix-generic". proc sqlite-determine-dll-install-rules {} { @@ -1826,10 +1827,6 @@ proc sqlite-handle-tcl {} { msg-result "TCL for code generation: [sqlite-determine-codegen-tcl]" } -# TODO? Figure out whether the DLL needs to go under /lib or /bin -# (msys, cygwin, etc). -# proc sqlite-handle-dll-install-dir {} {} - ######################################################################## # If the --dump-defines configure flag is provided then emit a list of # all [define] values to config.defines.txt, else do nothing. diff --git a/manifest b/manifest index 99629930b4..21486b878b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C tool/mksqlite3h.tcl:\swhen\sinvoking\sthe\smksourceid\sbinary,\sadd\sa\s.exe\sto\sit,\sif\sneeded,\sto\sappease\smsys2. -D 2025-02-22T14:53:00.893 +C Random\snon-functional\sconfigure\sscript\scleanups. +D 2025-02-22T14:53:31.061 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 6573f6bc6ff204de0139692648d7037ca0b6c067bac83a7b4e087f20a86866a4 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba -F autosetup/proj.tcl 3124addb1a46c7d9c8c38a3016cd23797185c3fd977570728397aaa9eadd0039 -F autosetup/sqlite-config.tcl 39c5431be1a2166d830ce73c5d779ea8434fd8216ffca80d979c3e58068a9b5d +F autosetup/proj.tcl 04fd2d110b6464f7a2847380a39bed647c2646a868a4ed60f7a625e52a9a8b20 +F autosetup/sqlite-config.tcl 2422f6fd2cd2120e8812c0e6e4f6d2cb888cc6312a49f265834d0913c09fa6b9 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad @@ -2210,8 +2210,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 95b71fc7e9887833f03f84c37b94385012a6ae76b86cd079372f1752833e0f5d -R 6ff9b839648f0f2fb665b46169234265 +P 08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f +R 3208ed004b6e716ce6b17ce27009887c U stephan -Z d4df9033ee40561e703d0422024e5649 +Z 3a85d85ac087bda321c6e7dc9381c222 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 51b2a6afad..11333122b3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -08c9e56f6082bb609a42f0e34c83542fe8b682757bc45616810d91491950fd0f +2ee73109809e7d4a9d203cfa42f29c62837c06dc414f9dbf17ce00d9bbb5a883