From: stephan Date: Fri, 14 Feb 2025 18:17:31 +0000 (+0000) Subject: More informative output for the pthread feature test. X-Git-Tag: major-release~282 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b5599726b752e72763d857a25897b8af882aed7;p=thirdparty%2Fsqlite.git More informative output for the pthread feature test. FossilOrigin-Name: 01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc --- diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl index 1c0e859042..d70220723f 100644 --- a/autosetup/sqlite-config.tcl +++ b/autosetup/sqlite-config.tcl @@ -690,6 +690,7 @@ proc sqlite-handle-threadsafe {} { define LDFLAGS_PTHREAD "" set enable 0 proj-if-opt-truthy threadsafe { + msg-result "Checking for libs..." if {[proj-check-function-in-lib pthread_create pthread] && [proj-check-function-in-lib pthread_mutexattr_init pthread]} { set enable 1 @@ -698,11 +699,13 @@ proc sqlite-handle-threadsafe {} { undefine lib_pthread_mutexattr_init } elseif {[proj-opt-was-provided threadsafe]} { user-error "Missing required pthread libraries. Use --disable-threadsafe to disable this check." + } else { + msg-result "pthread support not detected" } # Recall that LDFLAGS_PTHREAD might be empty even if pthreads if # found because it's in -lc on some platforms. } { - msg-result no + msg-result "Disabled using --disable-threadsafe" } sqlite-add-feature-flag -DSQLITE_THREADSAFE=${enable} return $enable diff --git a/manifest b/manifest index ac1e73bf34..17137cbb99 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sfailure\sto\sfind\spthreads\ssupport\snon-fatal\sunless\s--enable-threadsafe\sis\sspecifically\spassed\sin.\sBuild\sregression\sreported\sin\s[8e0fdb8c0d]. -D 2025-02-14T18:06:28.632 +C More\sinformative\soutput\sfor\sthe\spthread\sfeature\stest. +D 2025-02-14T18:17:31.710 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 9d193c15975228021821cb3eed667491c6de340baf26d5b21a2ad861187d4936 +F autosetup/sqlite-config.tcl 48c55d221189cda985cadd81a88d5a046d327db6e8c5f7395bfde577040ba59f 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 b0928f2043ed2a5d445c65f0d7271431e182f5a6fcd24ddcd57ea1cdcf4bbaa2 -R deb7bf34e9c57df9897124263106b638 +P 806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d +R 09a63536408c62281d4a45ffc0125d28 U stephan -Z 5ed369aff0b10c102cba383c3de65e06 +Z fe9efd4025c936400a0447a11687e271 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index cc8dc2bf44..d3ca8dc79f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -806ad1ac173d7c0d6d94bfccd3b961fc5c9541b32773c063a8c4082380d7a90d +01b9ed73ca6e72411dcf5a81f445c15c5bc42fa068fc7eca485ac72635b9d2fc