From: stephan <stephan@noemail.net>
Date: Thu, 6 Mar 2025 06:25:45 +0000 (+0000)
Subject: Have the configure script report cygwin as SQLITE_OS_UNIX instead of SQLITE_OS_WIN... 
X-Git-Tag: major-release~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d960e943bfbc7731c2120b4424f3fa3db462fea;p=thirdparty%2Fsqlite.git

Have the configure script report cygwin as SQLITE_OS_UNIX instead of SQLITE_OS_WIN, per off-list discussion with Jan Nijtmans.

FossilOrigin-Name: 5c28a17253e2fe56d7fd97cc43345b3fd8bd59fccea3fb1547ed87f7902f76f5
---

diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
index d5df21972e..fbed4b2daa 100644
--- a/autosetup/sqlite-config.tcl
+++ b/autosetup/sqlite-config.tcl
@@ -445,12 +445,15 @@ proc sqlite-post-options-init {} {
   }
   sqlite-autoreconfig
   proj-file-extensions
-  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
+  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
+    }
   }
   set ::sqliteConfig(msg-debug-enabled) [proj-val-truthy [get-env msg-debug 0]]
   sqlite-setup-default-cflags
@@ -1469,7 +1472,8 @@ proc sqlite-handle-out-implib {} {
 #
 # It does not distinguish between msys and msys2, returning msys for
 # both. The build does not, as of this writing, specifically support
-# msys v1.
+# msys v1. Similarly, this function returns "mingw" for both "mingw32"
+# and "mingw64".
 proc sqlite-env-is-unix-on-windows {{envTuple ""}} {
   if {"" eq $envTuple} {
     set envTuple [get-define host]
@@ -1480,7 +1484,7 @@ proc sqlite-env-is-unix-on-windows {{envTuple ""}} {
     *-*-ming*  { set name mingw }
     *-*-msys   { set name msys }
   }
-  return $name;
+  return $name
 }
 
 ########################################################################
diff --git a/manifest b/manifest
index 88edfa11a4..2a5bc38aac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\sthe\srecover\smodule\sadd\s"PRAGMA\sforeign_keys\s=\soff"\sto\sSQL\soutput.\sHave\sthe\sshell\stool\sadd\s".dbconfig\sdefensive\soff".
-D 2025-03-05T19:39:02.155
+C Have\sthe\sconfigure\sscript\sreport\scygwin\sas\sSQLITE_OS_UNIX\sinstead\sof\sSQLITE_OS_WIN,\sper\soff-list\sdiscussion\swith\sJan\sNijtmans.
+D 2025-03-06T06:25:45.580
 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 8e6cc8afe56eed424492d85560fbac0a1598023083f49469e9eb747a5757125e
+F autosetup/sqlite-config.tcl ab2bcd7c11d040cf3fc3de6154d214c7fcced5dd847f205ace03e719362e54d9
 F autosetup/system.tcl 51d4be76cd9a9074704b584e5c9cbba616202c8468cf9ba8a4f8294a7ab1dba9
 F configure 9a00b21dfd13757bbfb8d89b30660a89ec1f8f3a79402b8f9f9b6fc475c3303a x
 F contrib/sqlitecon.tcl eb4c6578e08dd353263958da0dc620f8400b869a50d06e271ab0be85a51a08d3
@@ -2213,8 +2213,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 373ae3f4de526c636c35db03d6b5c84526d6f144c1c3bebcbb257e52f563a203
-R 38fa5364fa5cffdc78b1c32dbd4f81d6
-U dan
-Z 397711d5197aed7f09beea9e54a174c7
+P dcfe3d3292851aa48a085a2c68623b049e2786c8dc7154ccc78508443973b5a1
+R 09123af9e772ceff500513e368fb5bd9
+U stephan
+Z a68807c6163d8598777c1bc7cb8b41a4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 88b0b3a5aa..de8f7f5127 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dcfe3d3292851aa48a085a2c68623b049e2786c8dc7154ccc78508443973b5a1
+5c28a17253e2fe56d7fd97cc43345b3fd8bd59fccea3fb1547ed87f7902f76f5