update windows deps

IanButterworth · IanButterworth · commit 101a4c63ee3a · 2025-06-01T22:50:06.000-04:00
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
@@ -76,7 +76,12 @@ const libgfortran = LazyLibrary(_libgfortran_path, dependencies=_libgfortran_dep
 _libstdcxx_dependencies = LazyLibrary[libgcc_s]
 const libstdcxx = LazyLibrary(_libstdcxx_path, dependencies=_libstdcxx_dependencies)
 
-const libgomp = LazyLibrary(_libgomp_path)
+if Sys.iswindows()
+    _libgomp_dependencies = LazyLibrary[libgcc_s]
+else
+    _libgomp_dependencies = LazyLibrary[]
+end
+const libgomp = LazyLibrary(_libgomp_path, dependencies=_libgomp_dependencies)
 
 # Some installations (such as those from-source) may not have `libssp`
 # So let's do a compile-time check to see if we've got it.
diff --git a/stdlib/LibCURL_jll/Project.toml b/stdlib/LibCURL_jll/Project.toml
@@ -3,12 +3,13 @@ uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
 version = "8.12.1+1"
 
 [deps]
+Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8"
-nghttp2_jll = "8e850ede-7688-5339-a07c-302acd2aaf8d"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
 Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+nghttp2_jll = "8e850ede-7688-5339-a07c-302acd2aaf8d"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -17,4 +18,5 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 test = ["Test"]
 
 [compat]
+CompilerSupportLibraries_jll = "1.3.0"
 julia = "1.11"
diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl
@@ -8,6 +8,7 @@ if !(Sys.iswindows() || Sys.isapple())
     # On Windows and macOS we use system SSL/crypto libraries
     using OpenSSL_jll
 end
+using CompilerSupportLibraries_jll
 
 export libcurl
 
@@ -20,7 +21,9 @@ artifact_dir::String = ""
 libcurl_path::String = ""
 
 _libcurl_dependencies = LazyLibrary[libz, libnghttp2, libssh2]
-if !(Sys.iswindows() || Sys.isapple())
+if Sys.iswindows()
+    push!(_libcurl_dependencies, libgcc_s)
+elseif !Sys.isapple()
     append!(_libcurl_dependencies, [libssl, libcrypto])
 end
 
@@ -41,6 +44,12 @@ function eager_mode()
     Zlib_jll.eager_mode()
     nghttp2_jll.eager_mode()
     LibSSH2_jll.eager_mode()
+    @static if Sys.iswindows()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
+    @static if !(Sys.iswindows() || Sys.isapple())
+        OpenSSL_jll.eager_mode()
+    end
     dlopen(libcurl)
 end
 is_available() = true
diff --git a/stdlib/LibGit2_jll/Project.toml b/stdlib/LibGit2_jll/Project.toml
@@ -7,9 +7,11 @@ OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
 LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
 [compat]
 julia = "1.9"
+CompilerSupportLibraries_jll = "1.3.0"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
@@ -8,6 +8,7 @@ if !(Sys.iswindows() || Sys.isapple())
     # On Windows and macOS we use system SSL/crypto libraries
     using OpenSSL_jll
 end
+using CompilerSupportLibraries_jll
 
 export libgit2
 
@@ -27,7 +28,9 @@ else
     const _libgit2_path = BundledLazyLibraryPath("libgit2.so.1.9")
 end
 
-if Sys.isfreebsd()
+if Sys.iswindows()
+    _libgit2_dependencies = LazyLibrary[libssh2, libgcc_s]
+elseif Sys.isfreebsd()
     _libgit2_dependencies = LazyLibrary[libssh2, libssl, libcrypto]
 else
     _libgit2_dependencies = LazyLibrary[libssh2]
@@ -39,6 +42,9 @@ function eager_mode()
     @static if !(Sys.iswindows() || Sys.isapple())
         OpenSSL_jll.eager_mode()
     end
+    @static if Sys.iswindows()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
     dlopen(libgit2)
 end
 is_available() = true
diff --git a/stdlib/LibSSH2_jll/Project.toml b/stdlib/LibSSH2_jll/Project.toml
@@ -7,9 +7,11 @@ OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
 [compat]
 julia = "1.8"
+CompilerSupportLibraries_jll = "1.3.0"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
@@ -8,6 +8,7 @@ if !Sys.iswindows()
     # On Windows we use system SSL/crypto libraries
     using OpenSSL_jll
 end
+using CompilerSupportLibraries_jll
 
 export libssh2
 
@@ -22,7 +23,7 @@ libssh2_path::String = ""
 
 if Sys.iswindows()
     const _libssh2_path = BundledLazyLibraryPath("libssh2.dll")
-    _libssh2_dependencies = LazyLibrary[]
+    _libssh2_dependencies = LazyLibrary[libgcc_s]
 elseif Sys.isapple()
     const _libssh2_path = BundledLazyLibraryPath("libssh2.1.dylib")
     _libssh2_dependencies = LazyLibrary[libz, libcrypto]
@@ -40,6 +41,8 @@ function eager_mode()
     Zlib_jll.eager_mode()
     @static if !Sys.iswindows()
         OpenSSL_jll.eager_mode()
+    else
+        CompilerSupportLibraries_jll.eager_mode()
     end
     dlopen(libssh2)
 end
diff --git a/stdlib/MPFR_jll/Project.toml b/stdlib/MPFR_jll/Project.toml
@@ -3,11 +3,13 @@ uuid = "3a97d323-0669-5f0c-9066-3539efd106a3"
 version = "4.2.2+0"
 
 [deps]
+Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 GMP_jll = "781609d7-10c4-51f6-84f2-b8444358ff6d"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
-Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 
 [compat]
+CompilerSupportLibraries_jll = "1.3.0"
 julia = "1.6"
 
 [extras]
diff --git a/stdlib/MPFR_jll/src/MPFR_jll.jl b/stdlib/MPFR_jll/src/MPFR_jll.jl
@@ -2,7 +2,7 @@
 
 ## dummy stub for https://github.com/JuliaBinaryWrappers/MPFR_jll.jl
 baremodule MPFR_jll
-using Base, Libdl, GMP_jll
+using Base, Libdl, GMP_jll, CompilerSupportLibraries_jll
 
 export libmpfr
 
@@ -22,12 +22,20 @@ else
     const _libmpfr_path = BundledLazyLibraryPath("libmpfr.so.6")
 end
 
-_libmpfr_dependencies = LazyLibrary[libgmp]
+if Sys.iswindows()
+    _libmpfr_dependencies = LazyLibrary[libgmp, libgcc_s]
+else
+    _libmpfr_dependencies = LazyLibrary[libgmp]
+end
 
 const libmpfr = LazyLibrary(_libmpfr_path, dependencies=_libmpfr_dependencies)
 
 function eager_mode()
     dlopen(libmpfr)
+    GMP_jll.eager_mode()
+    @static if Sys.iswindows()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
 end
 is_available() = true
 
diff --git a/stdlib/Manifest.toml b/stdlib/Manifest.toml
@@ -91,7 +91,7 @@ uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
 version = "0.6.4"
 
 [[deps.LibCURL_jll]]
-deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "LibSSH2_jll", "Libdl", "OpenSSL_jll", "Zlib_jll", "nghttp2_jll"]
 uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
 version = "8.12.1+1"
 
@@ -101,12 +101,12 @@ uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
 version = "1.11.0"
 
 [[deps.LibGit2_jll]]
-deps = ["Artifacts", "LibSSH2_jll", "Libdl", "OpenSSL_jll"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "LibSSH2_jll", "Libdl", "OpenSSL_jll"]
 uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
 version = "1.9.0+0"
 
 [[deps.LibSSH2_jll]]
-deps = ["Artifacts", "Libdl", "OpenSSL_jll", "Zlib_jll"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "OpenSSL_jll", "Zlib_jll"]
 uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
 version = "1.11.3+1"
 
@@ -134,7 +134,7 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 version = "1.11.0"
 
 [[deps.MPFR_jll]]
-deps = ["Artifacts", "GMP_jll", "Libdl"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "GMP_jll", "Libdl"]
 uuid = "3a97d323-0669-5f0c-9066-3539efd106a3"
 version = "4.2.2+0"
 
@@ -149,7 +149,7 @@ version = "1.11.0"
 
 [[deps.MozillaCACerts_jll]]
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
-version = "2025.2.25"
+version = "2025.5.20"
 
 [[deps.NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -161,7 +161,7 @@ uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
 version = "0.3.29+0"
 
 [[deps.OpenLibm_jll]]
-deps = ["Artifacts", "Libdl"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
 version = "0.8.5+0"
 
@@ -275,7 +275,7 @@ uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
 version = "1.3.1+2"
 
 [[deps.Zstd_jll]]
-deps = ["Libdl"]
+deps = ["CompilerSupportLibraries_jll", "Libdl"]
 uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
 version = "1.5.7+1"
 
@@ -295,7 +295,7 @@ uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
 version = "5.12.0+0"
 
 [[deps.nghttp2_jll]]
-deps = ["Artifacts", "Libdl"]
+deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
 uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
 version = "1.65.0+0"
 
diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
@@ -38,6 +38,9 @@ if Sys.isapple()
         push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libgcc_s)
     end
 end
+if Sys.iswindows()
+    push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libgcc_s)
+end
 const libopenblas = LazyLibrary(_libopenblas_path, dependencies=_libopenblas_dependencies)
 
 # Conform to LazyJLLWrappers API
diff --git a/stdlib/OpenLibm_jll/Project.toml b/stdlib/OpenLibm_jll/Project.toml
@@ -3,10 +3,12 @@ uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
 version = "0.8.5+0"
 
 [deps]
-Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
+CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [compat]
+CompilerSupportLibraries_jll = "1.3.0"
 julia = "1.0"
 
 [extras]
diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
@@ -3,6 +3,7 @@
 ## dummy stub for https://github.com/JuliaBinaryWrappers/OpenLibm_jll.jl
 baremodule OpenLibm_jll
 using Base, Libdl
+using CompilerSupportLibraries_jll
 
 export libopenlibm
 
@@ -21,11 +22,18 @@ elseif Sys.isapple()
 else
     const _libopenlibm_path = BundledLazyLibraryPath("libopenlibm.so.4")
 end
-
-const libopenlibm = LazyLibrary(_libopenlibm_path)
+if Sys.iswindows()
+    const _libopenlibm_dependencies = LazyLibrary[CompilerSupportLibraries_jll.libgcc_s]
+else
+    const _libopenlibm_dependencies = LazyLibrary[]
+end
+const libopenlibm = LazyLibrary(_libopenlibm_path, dependencies=_libopenlibm_dependencies)
 
 function eager_mode()
     dlopen(libopenlibm)
+    @static if Sys.iswindows()
+        CompilerSupportLibraries_jll.eager_mode()
+    end
 end
 is_available() = true
 
diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
@@ -71,37 +71,73 @@ const libsuitesparseconfig = LazyLibrary(_libsuitesparseconfig_path)
 const libldl = LazyLibrary(_libldl_path)
 const libbtf = LazyLibrary(_libbtf_path)
 
-_libcolamd_dependencies = LazyLibrary[libsuitesparseconfig]
+if Sys.iswindows()
+    _libcolamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
+else
+    _libcolamd_dependencies = LazyLibrary[libsuitesparseconfig]
+end
 const libcolamd = LazyLibrary(_libcolamd_path; dependencies=_libcolamd_dependencies)
 
-_libamd_dependencies = LazyLibrary[libsuitesparseconfig]
+if Sys.iswindows()
+    _libamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
+else
+    _libamd_dependencies = LazyLibrary[libsuitesparseconfig]
+end
 const libamd = LazyLibrary(_libamd_path; dependencies=_libamd_dependencies)
 
-_libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
+if Sys.iswindows()
+    _libcamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
+else
+    _libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
+end
 const libcamd = LazyLibrary(_libcamd_path; dependencies=_libcamd_dependencies)
 
-_libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
+if Sys.iswindows()
+    _libccolamd_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
+else
+    _libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
+end
 const libccolamd = LazyLibrary(_libccolamd_path; dependencies=_libccolamd_dependencies)
 
-_librbio_dependencies = LazyLibrary[libsuitesparseconfig]
+if Sys.iswindows()
+    _librbio_dependencies = LazyLibrary[libsuitesparseconfig, libgcc_s]
+else
+    _librbio_dependencies = LazyLibrary[libsuitesparseconfig]
+end
 const librbio = LazyLibrary(_librbio_path; dependencies=_librbio_dependencies)
 
-_libcholmod_dependencies = LazyLibrary[
-    libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline
+if Sys.iswindows()
+    _libcholmod_dependencies = LazyLibrary[
+        libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline, libgcc_s
     ]
+else
+    _libcholmod_dependencies = LazyLibrary[
+        libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline
+    ]
+end
 const libcholmod = LazyLibrary(_libcholmod_path; dependencies=_libcholmod_dependencies)
 
-_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
+if Sys.iswindows()
+    _libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf, libgcc_s]
+else
+    _libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
+end
 const libklu = LazyLibrary(_libklu_path; dependencies=_libklu_dependencies)
 
-if Sys.isfreebsd() || Sys.isapple()
+if Sys.iswindows()
+    _libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline, libgcc_s]
+elseif Sys.isfreebsd() || Sys.isapple()
     _libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline]
 else
     _libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline, libstdcxx, libgcc_s]
 end
 const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
 
-_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
+if Sys.iswindows()
+    _libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline, libgcc_s]
+else
+    _libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
+end
 const libumfpack = LazyLibrary(_libumfpack_path; dependencies=_libumfpack_dependencies)
 
 function eager_mode()
diff --git a/stdlib/Zstd_jll/Project.toml b/stdlib/Zstd_jll/Project.toml
diff --git a/stdlib/Zstd_jll/src/Zstd_jll.jl b/stdlib/Zstd_jll/src/Zstd_jll.jl
diff --git a/stdlib/nghttp2_jll/Project.toml b/stdlib/nghttp2_jll/Project.toml
diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
diff --git a/test/stdlib_dependencies.jl b/test/stdlib_dependencies.jl
