Skip to content

Commit 0d12539

Browse files
test fixes etc.
1 parent 5559618 commit 0d12539

File tree

10 files changed

+55
-38
lines changed

10 files changed

+55
-38
lines changed

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
baremodule CompilerSupportLibraries_jll
66
using Base, Libdl, Base.BinaryPlatforms
77

8-
export libgfortran, libstdcxx, libgomp, libatomic, libgcc_s
8+
export libgfortran, libstdcxx, libgomp, libatomic, libgcc_s, libquadmath
99

1010
# These get calculated in __init__()
1111
const PATH = Ref("")

stdlib/GMP_jll/src/GMP_jll.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ end
2828

2929
const libgmp = LazyLibrary(_libgmp_path)
3030

31-
_libgmpxx_dependencies = LazyLibrary[libgmp, libstdcxx, libgcc_s]
31+
if Sys.isapple()
32+
_libgmpxx_dependencies = LazyLibrary[libgmp]
33+
else
34+
_libgmpxx_dependencies = LazyLibrary[libgmp, libstdcxx, libgcc_s]
35+
end
3236
const libgmpxx = LazyLibrary(
3337
_libgmpxx_path,
3438
dependencies=_libgmpxx_dependencies,

stdlib/LibSSH2_jll/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "1.11.3+1"
66
OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
77
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
88
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
9+
Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
910

1011
[compat]
1112
julia = "1.8"

stdlib/LibSSH2_jll/src/LibSSH2_jll.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## dummy stub for https://github.com/JuliaBinaryWrappers/LibSSH2_jll.jl
44

55
baremodule LibSSH2_jll
6-
using Base, Libdl
6+
using Base, Libdl, Zlib_jll
77
if !Sys.iswindows()
88
# On Windows we use system SSL/crypto libraries
99
using OpenSSL_jll
@@ -20,15 +20,15 @@ artifact_dir::String = ""
2020
libssh2_path::String = ""
2121

2222

23-
_libssh2_dependencies = LazyLibrary[]
2423
if Sys.iswindows()
2524
const _libssh2_path = BundledLazyLibraryPath("libssh2.dll")
25+
_libssh2_dependencies = LazyLibrary[]
2626
elseif Sys.isapple()
2727
const _libssh2_path = BundledLazyLibraryPath("libssh2.1.dylib")
28-
push!(_libssh2_dependencies, libcrypto)
28+
_libssh2_dependencies = LazyLibrary[libz, libcrypto]
2929
else
3030
const _libssh2_path = BundledLazyLibraryPath("libssh2.so.1")
31-
push!(_libssh2_dependencies, libcrypto)
31+
_libssh2_dependencies = LazyLibrary[libcrypto]
3232
end
3333

3434
const libssh2 = LazyLibrary(_libssh2_path, dependencies=_libssh2_dependencies)

stdlib/MPFR_jll/src/MPFR_jll.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ const LIBPATH_list = String[]
1414
artifact_dir::String = ""
1515
libmpfr_path::String = ""
1616

17-
_libmpfr_dependencies = LazyLibrary[libgmp, libgmpxx]
18-
1917
if Sys.iswindows()
2018
const _libmpfr_path = BundledLazyLibraryPath("libmpfr-6.dll")
2119
elseif Sys.isapple()
@@ -24,6 +22,7 @@ else
2422
const _libmpfr_path = BundledLazyLibraryPath("libmpfr.so.6")
2523
end
2624

25+
_libmpfr_dependencies = LazyLibrary[libgmp]
2726
const libmpfr = LazyLibrary(
2827
_libmpfr_path,
2928
dependencies=_libmpfr_dependencies,

stdlib/Manifest.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.12.0-DEV"
3+
julia_version = "1.13.0-DEV"
44
manifest_format = "2.0"
5-
project_hash = "1cb1aede0b4f0a2f12806233b9f188a63d6acf04"
5+
project_hash = "9dd25f3dfe3d3b5ebc31553fdfd46b5716d5b1ca"
66

77
[[deps.ArgTools]]
88
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -23,7 +23,7 @@ version = "1.11.0"
2323
[[deps.CompilerSupportLibraries_jll]]
2424
deps = ["Artifacts", "Libdl"]
2525
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
26-
version = "1.2.0+0"
26+
version = "1.3.0+1"
2727

2828
[[deps.Dates]]
2929
deps = ["Printf"]
@@ -44,7 +44,7 @@ version = "1.11.0"
4444
[[deps.Downloads]]
4545
deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
4646
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
47-
version = "1.6.0"
47+
version = "1.7.0"
4848

4949
[[deps.FileWatching]]
5050
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -56,7 +56,7 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
5656
version = "1.11.0"
5757

5858
[[deps.GMP_jll]]
59-
deps = ["Artifacts", "Libdl"]
59+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
6060
uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d"
6161
version = "6.3.0+2"
6262

@@ -73,7 +73,7 @@ version = "1.12.0"
7373
[[deps.LLD_jll]]
7474
deps = ["Artifacts", "Libdl", "Zlib_jll", "libLLVM_jll"]
7575
uuid = "d55e3150-da41-5e91-b323-ecfd1eec6109"
76-
version = "18.1.7+3"
76+
version = "20.1.2+0"
7777

7878
[[deps.LLVMLibUnwind_jll]]
7979
deps = ["Artifacts", "Libdl"]
@@ -106,7 +106,7 @@ uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
106106
version = "1.9.0+0"
107107

108108
[[deps.LibSSH2_jll]]
109-
deps = ["Artifacts", "Libdl", "OpenSSL_jll"]
109+
deps = ["Artifacts", "Libdl", "OpenSSL_jll", "Zlib_jll"]
110110
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
111111
version = "1.11.3+1"
112112

@@ -116,7 +116,7 @@ uuid = "183b4373-6708-53ba-ad28-60e28bb38547"
116116
version = "2.0.1+20"
117117

118118
[[deps.LibUnwind_jll]]
119-
deps = ["Artifacts", "Libdl"]
119+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "Zlib_jll"]
120120
uuid = "745a5e78-f969-53e9-954f-d19f2f74f4e3"
121121
version = "1.8.1+2"
122122

@@ -127,7 +127,7 @@ version = "1.11.0"
127127
[[deps.LinearAlgebra]]
128128
deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
129129
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
130-
version = "1.11.0"
130+
version = "1.12.0"
131131

132132
[[deps.Logging]]
133133
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -149,7 +149,7 @@ version = "1.11.0"
149149

150150
[[deps.MozillaCACerts_jll]]
151151
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
152-
version = "2024.11.26"
152+
version = "2025.2.25"
153153

154154
[[deps.NetworkOptions]]
155155
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -158,7 +158,7 @@ version = "1.3.0"
158158
[[deps.OpenBLAS_jll]]
159159
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
160160
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
161-
version = "0.3.28+3"
161+
version = "0.3.29+0"
162162

163163
[[deps.OpenLibm_jll]]
164164
deps = ["Artifacts", "Libdl"]
@@ -178,7 +178,7 @@ version = "10.44.0+1"
178178
[[deps.Pkg]]
179179
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"]
180180
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
181-
version = "1.12.0"
181+
version = "1.13.0"
182182
weakdeps = ["REPL"]
183183

184184
[deps.Pkg.extensions]
@@ -195,7 +195,7 @@ uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
195195
version = "1.11.0"
196196

197197
[[deps.REPL]]
198-
deps = ["InteractiveUtils", "JuliaSyntaxHighlighting", "Markdown", "Sockets", "StyledStrings", "Unicode"]
198+
deps = ["FileWatching", "InteractiveUtils", "JuliaSyntaxHighlighting", "Markdown", "Sockets", "StyledStrings", "Unicode"]
199199
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
200200
version = "1.11.0"
201201

@@ -241,7 +241,7 @@ uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b"
241241
version = "1.11.0"
242242

243243
[[deps.SuiteSparse_jll]]
244-
deps = ["Artifacts", "Libdl", "libblastrampoline_jll"]
244+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "libblastrampoline_jll"]
245245
uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
246246
version = "7.10.1+0"
247247

@@ -280,9 +280,9 @@ uuid = "05ff407c-b0c1-5878-9df8-858cc2e60c36"
280280
version = "2.2.5+2"
281281

282282
[[deps.libLLVM_jll]]
283-
deps = ["Artifacts", "Libdl"]
283+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl", "Zlib_jll"]
284284
uuid = "8f36deef-c2a5-5394-99ed-8e07531fb29a"
285-
version = "18.1.7+3"
285+
version = "20.1.2+0"
286286

287287
[[deps.libblastrampoline_jll]]
288288
deps = ["Artifacts", "Libdl"]

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ elseif Sys.isapple()
2828
else
2929
const _libopenblas_path = BundledLazyLibraryPath(string("libopenblas", libsuffix, ".so"))
3030
end
31-
const libopenblas = LazyLibrary(_libopenblas_path, dependencies=[libgfortran])
31+
32+
if Sys.isapple()
33+
_libopenblas_dependencies = LazyLibrary[libquadmath, libgfortran]
34+
else
35+
_libopenblas_dependencies = LazyLibrary[libgfortran]
36+
end
37+
const libopenblas = LazyLibrary(_libopenblas_path, dependencies=_libopenblas_dependencies)
3238

3339
# Conform to LazyJLLWrappers API
3440
function eager_mode()

stdlib/SuiteSparse_jll/Project.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
33
version = "7.10.1+0"
44

55
[deps]
6-
libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93"
7-
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
86
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
7+
CompilerSupportLibraries_jll = "e66e0078-7015-5450-92f7-15fbd957f2ae"
8+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
9+
libblastrampoline_jll = "8e850b90-86db-534c-a0d3-1478176c7d93"
910

1011
[compat]
12+
CompilerSupportLibraries_jll = "1.3.0"
1113
julia = "1.13"
1214

1315
[extras]

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## dummy stub for https://github.com/JuliaBinaryWrappers/SuiteSparse_jll.jl
44
baremodule SuiteSparse_jll
5-
using Base, Libdl, libblastrampoline_jll
5+
using Base, Libdl, libblastrampoline_jll, CompilerSupportLibraries_jll
66

77
export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libldl, librbio, libspqr, libsuitesparseconfig, libumfpack
88

@@ -68,17 +68,15 @@ else
6868
end
6969

7070
const libsuitesparseconfig = LazyLibrary(_libsuitesparseconfig_path)
71+
const libldl = LazyLibrary(_libldl_path)
72+
const libbtf = LazyLibrary(_libbtf_path)
7173

7274
const libcolamd = LazyLibrary(_libcolamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
7375
const libamd = LazyLibrary(_libamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
7476
const libcamd = LazyLibrary(_libcamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
7577
const libccolamd = LazyLibrary(_libccolamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
76-
const libldl = LazyLibrary(_libldl_path; dependencies=LazyLibrary[libsuitesparseconfig])
7778
const librbio = LazyLibrary(_librbio_path; dependencies=LazyLibrary[libsuitesparseconfig])
7879

79-
_libbtf_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd]
80-
const libbtf = LazyLibrary(_libbtf_path; dependencies=_libbtf_dependencies)
81-
8280
_libcholmod_dependencies = LazyLibrary[
8381
libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline, # libmetis, liblapack?
8482
]
@@ -87,12 +85,15 @@ const libcholmod = LazyLibrary(_libcholmod_path; dependencies=_libcholmod_depend
8785
_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
8886
const libklu = LazyLibrary(_libklu_path; dependencies=_libklu_dependencies)
8987

90-
_libspqr_dependencies = LazyLibrary[
91-
libsuitesparseconfig, libcholmod, libamd, libcolamd, libblastrampoline, # liblapack?
92-
]
88+
if Sys.isapple()
89+
_libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline]
90+
else
91+
_libspqr_dependencies = LazyLibrary[libstdcxx, libgcc_s, libsuitesparseconfig, libcholmod, libblastrampoline]
92+
end
93+
9394
const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
9495

95-
_libumfpack_dependencies = LazyLibrary[ libsuitesparseconfig, libamd, libcolamd, libcholmod, libblastrampoline]
96+
_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
9697
const libumfpack = LazyLibrary(_libumfpack_path; dependencies=_libumfpack_dependencies)
9798

9899

stdlib/libLLVM_jll/src/libLLVM_jll.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ const LIBPATH_list = String[]
1515
artifact_dir::String = ""
1616
libLLVM_path::String = ""
1717

18-
_libLLVM_dependencies = LazyLibrary[libstdcxx, libgcc_s, libz]
19-
2018
if Sys.iswindows()
2119
const _libLLVM_path = BundledLazyLibraryPath("$(Base.libllvm_name).dll")
2220
elseif Sys.isapple()
@@ -25,6 +23,12 @@ else
2523
const _libLLVM_path = BundledLazyLibraryPath("$(Base.libllvm_name).so")
2624
end
2725

26+
if Sys.isapple()
27+
_libLLVM_dependencies = LazyLibrary[libz]
28+
else
29+
_libLLVM_dependencies = LazyLibrary[libstdcxx, libgcc_s, libz]
30+
end
31+
2832
const libLLVM = LazyLibrary(
2933
_libLLVM_path,
3034
dependencies=_libLLVM_dependencies,

0 commit comments

Comments
 (0)