From: stephan <stephan@noemail.net>
Date: Thu, 6 Mar 2025 09:29:15 +0000 (+0000)
Subject: Back out the most significant part of [5c28a17253e2f], as Cygwin is a hybrid. With... 
X-Git-Tag: major-release~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d75acb8312a6aacd5cccecf46781e44348bf2a43;p=thirdparty%2Fsqlite.git

Back out the most significant part of [5c28a17253e2f], as Cygwin is a hybrid. With SQLITE_OS_UNIX it will use POSIX locking, which will misinteract with apps using Windows-style locking.

FossilOrigin-Name: 44adf8f38761a0d756c047f93fc76fc1d0aba8cc209970e3ba13e7040dd14b13
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index 236362040e..56567ddb96 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -445,15 +445,12 @@ proc sqlite-post-options-init {} {
   }
   sqlite-autoreconfig
   proj-file-extensions
-  switch -exact -- [sqlite-env-is-unix-on-windows] {
-    "" - cygwin {
-      define SQLITE_OS_UNIX 1
-      define SQLITE_OS_WIN 0
-    }
-    default {
-      define SQLITE_OS_UNIX 0
-      define SQLITE_OS_WIN 1
-    }
+  if {".exe" eq [get-define TARGET_EXEEXT]} {
+    define SQLITE_OS_UNIX 0
+    define SQLITE_OS_WIN 1
+  } else {
+    define SQLITE_OS_UNIX 1
+    define SQLITE_OS_WIN 0
   }
   set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]]
   sqlite-setup-default-cflags
diff --git a/manifest b/manifest
index 0d3d31462d..87953e4837 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Various\stypo\sfixes\sreported\sby\sDaniel\sDumitriu.\sNo\sfunctional\schanges.
-D 2025-03-06T09:08:38.328
+C Back\sout\sthe\smost\ssignificant\spart\sof\s[5c28a17253e2f],\sas\sCygwin\sis\sa\shybrid.\sWith\sSQLITE_OS_UNIX\sit\swill\suse\sPOSIX\slocking,\swhich\swill\smisinteract\swith\sapps\susing\sWindows-style\slocking.
+D 2025-03-06T09:29:15.581
 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 a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl e69b91f814ea510057ce7663845de703c3746d71cff9a0db6b2563ee3e7fd25e
-F autosetup/sqlite-config.tcl 80e45c16bb6ca0926715f11f491218f85d7502e0686c4f5bb7c2831f707cc5c5
+F autosetup/sqlite-config.tcl 831985320d98002fcd5ea064cae8a49f8afcd9685d83178ef1ebb79189b5045c
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2213,8 +2213,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P f31042595b8f8a378db9778c9a8223b07ec02cf2f528581ba43bf72b5b03c964
-R 16a05868b70b097e20c3e8f7579eb6c7
+P 37e6ec777445d8ef81acecbb66f86ae78f2ae67ef0bfd3fbd089da51fff35cc9
+Q -5c28a17253e2fe56d7fd97cc43345b3fd8bd59fccea3fb1547ed87f7902f76f5
+R 38fc0dfe04503476c9f4513e988a6328
 U stephan
-Z ab4eac517d442049f191279c2e31dd3c
+Z 6aa54f098bdb538dd8ab72739dad136a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 89d687bee3..59fdfc09cf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-37e6ec777445d8ef81acecbb66f86ae78f2ae67ef0bfd3fbd089da51fff35cc9
+44adf8f38761a0d756c047f93fc76fc1d0aba8cc209970e3ba13e7040dd14b13