Skip to content

Commit 96e249e

Browse files
more test fixes
1 parent 0d12539 commit 96e249e

File tree

9 files changed

+108
-32
lines changed

9 files changed

+108
-32
lines changed

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,28 @@ if @isdefined(_libatomic_path)
6464
const libatomic = LazyLibrary(_libatomic_path)
6565
end
6666
const libgcc_s = LazyLibrary(_libgcc_s_path)
67-
libgfortran_deps = [libgcc_s]
68-
if @isdefined _libquadmath_path
69-
const libquadmath = LazyLibrary(_libquadmath_path)
70-
push!(libgfortran_deps, libquadmath)
67+
68+
@static if Sys.isfreebsd()
69+
_libgfortran_deps = LazyLibrary[]
70+
else
71+
_libgfortran_deps = [libgcc_s]
72+
if @isdefined _libquadmath_path
73+
const libquadmath = LazyLibrary(_libquadmath_path)
74+
push!(_libgfortran_deps, libquadmath)
75+
end
76+
end
77+
78+
const libgfortran = LazyLibrary(_libgfortran_path, dependencies=_libgfortran_deps)
79+
80+
if Sys.isfreebsd()
81+
_libstdcxx_dependencies = LazyLibrary[]
82+
elseif Sys.isapple()
83+
_libstdcxx_dependencies = LazyLibrary[libgcc_s]
84+
else
85+
_libstdcxx_dependencies = LazyLibrary[libgcc_s, libgfortran]
7186
end
72-
const libgfortran = LazyLibrary(_libgfortran_path, dependencies=libgfortran_deps)
73-
const libstdcxx = LazyLibrary(_libstdcxx_path, dependencies=[libgcc_s])
87+
const libstdcxx = LazyLibrary(_libstdcxx_path, dependencies=_libstdcxx_dependencies)
88+
7489
const libgomp = LazyLibrary(_libgomp_path)
7590

7691
# Some installations (such as those from-source) may not have `libssp`

stdlib/GMP_jll/src/GMP_jll.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ const libgmp = LazyLibrary(_libgmp_path)
3030

3131
if Sys.isapple()
3232
_libgmpxx_dependencies = LazyLibrary[libgmp]
33+
elseif Sys.isfreebsd()
34+
_libgmpxx_dependencies = LazyLibrary[]
3335
else
3436
_libgmpxx_dependencies = LazyLibrary[libgmp, libstdcxx, libgcc_s]
3537
end

stdlib/LibCURL_jll/src/LibCURL_jll.jl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,21 @@ const LIBPATH_list = String[]
1919
artifact_dir::String = ""
2020
libcurl_path::String = ""
2121

22-
_libcurl_dependencies = LazyLibrary[
23-
libz, libnghttp2, libssh2
24-
]
22+
if Sys.isfreebsd()
23+
_libcurl_dependencies = LazyLibrary[]
24+
else
25+
_libcurl_dependencies = LazyLibrary[libz, libnghttp2, libssh2]
26+
if !(Sys.iswindows() || Sys.isapple())
27+
append!(_libcurl_dependencies, [libssl, libcrypto])
28+
end
29+
end
30+
2531
if Sys.iswindows()
2632
const _libcurl_path = BundledLazyLibraryPath("libcurl-4.dll")
2733
elseif Sys.isapple()
2834
const _libcurl_path = BundledLazyLibraryPath("libcurl.4.dylib")
2935
else
3036
const _libcurl_path = BundledLazyLibraryPath("libcurl.so.4")
31-
append!(_libcurl_dependencies, [libssl, libcrypto])
3237
end
3338

3439
const libcurl = LazyLibrary(

stdlib/LibSSH2_jll/src/LibSSH2_jll.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ if Sys.iswindows()
2626
elseif Sys.isapple()
2727
const _libssh2_path = BundledLazyLibraryPath("libssh2.1.dylib")
2828
_libssh2_dependencies = LazyLibrary[libz, libcrypto]
29+
elseif Sys.isfreebsd()
30+
const _libssh2_path = BundledLazyLibraryPath("libssh2.so.1")
31+
_libssh2_dependencies = LazyLibrary[]
2932
else
3033
const _libssh2_path = BundledLazyLibraryPath("libssh2.so.1")
3134
_libssh2_dependencies = LazyLibrary[libcrypto]

stdlib/LibUnwind_jll/src/LibUnwind_jll.jl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ artifact_dir::String = ""
1818
libunwind_path::String = ""
1919

2020
const _libunwind_path = BundledLazyLibraryPath("libunwind.so.8")
21-
const libunwind = LazyLibrary(
22-
_libunwind_path, dependencies=[libgcc_s, libz]
23-
)
21+
_libunwind_dependencies = if Sys.isfreebsd()
22+
LazyLibrary[]
23+
else
24+
LazyLibrary[libgcc_s, libz]
25+
end
26+
const libunwind = LazyLibrary(_libunwind_path, dependencies=_libunwind_dependencies)
27+
2428

2529
function eager_mode()
2630
CompilerSupportLibraries_jll.eager_mode()

stdlib/MPFR_jll/src/MPFR_jll.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ else
2222
const _libmpfr_path = BundledLazyLibraryPath("libmpfr.so.6")
2323
end
2424

25-
_libmpfr_dependencies = LazyLibrary[libgmp]
26-
const libmpfr = LazyLibrary(
27-
_libmpfr_path,
28-
dependencies=_libmpfr_dependencies,
29-
)
25+
if Sys.isfreebsd()
26+
_libmpfr_dependencies = LazyLibrary[]
27+
else
28+
_libmpfr_dependencies = LazyLibrary[libgmp]
29+
end
30+
31+
const libmpfr = LazyLibrary(_libmpfr_path, dependencies=_libmpfr_dependencies)
3032

3133
function eager_mode()
3234
dlopen(libmpfr)

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ end
3131

3232
if Sys.isapple()
3333
_libopenblas_dependencies = LazyLibrary[libquadmath, libgfortran]
34+
elseif Sys.isfreebsd()
35+
_libopenblas_dependencies = LazyLibrary[]
3436
else
3537
_libopenblas_dependencies = LazyLibrary[libgfortran]
3638
end

stdlib/OpenSSL_jll/src/OpenSSL_jll.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ else
3333
end
3434

3535
const libcrypto = LazyLibrary(_libcrypto_path)
36-
const libssl = LazyLibrary(_libssl_path, dependencies=[libcrypto])
36+
37+
if Sys.isfreebsd()
38+
_libssl_dependencies = LazyLibrary[]
39+
else
40+
_libssl_dependencies = LazyLibrary[libcrypto]
41+
end
42+
const libssl = LazyLibrary(_libssl_path, dependencies=_libssl_dependencies)
3743

3844
function eager_mode()
3945
dlopen(libcrypto)

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,69 @@ const libsuitesparseconfig = LazyLibrary(_libsuitesparseconfig_path)
7171
const libldl = LazyLibrary(_libldl_path)
7272
const libbtf = LazyLibrary(_libbtf_path)
7373

74-
const libcolamd = LazyLibrary(_libcolamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
75-
const libamd = LazyLibrary(_libamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
76-
const libcamd = LazyLibrary(_libcamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
77-
const libccolamd = LazyLibrary(_libccolamd_path; dependencies=LazyLibrary[libsuitesparseconfig])
78-
const librbio = LazyLibrary(_librbio_path; dependencies=LazyLibrary[libsuitesparseconfig])
79-
80-
_libcholmod_dependencies = LazyLibrary[
81-
libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline, # libmetis, liblapack?
82-
]
74+
if Sys.isfreebsd()
75+
_libcolamd_dependencies = LazyLibrary[]
76+
else
77+
_libcolamd_dependencies = LazyLibrary[libsuitesparseconfig]
78+
end
79+
const libcolamd = LazyLibrary(_libcolamd_path; dependencies=_libcolamd_dependencies)
80+
81+
if Sys.isfreebsd()
82+
_libamd_dependencies = LazyLibrary[]
83+
else
84+
_libamd_dependencies = LazyLibrary[libsuitesparseconfig]
85+
end
86+
const libamd = LazyLibrary(_libamd_path; dependencies=_libamd_dependencies)
87+
88+
if Sys.isfreebsd()
89+
_libcamd_dependencies = LazyLibrary[]
90+
else
91+
_libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
92+
end
93+
const libcamd = LazyLibrary(_libcamd_path; dependencies=_libcamd_dependencies)
94+
95+
if Sys.isfreebsd()
96+
_libccolamd_dependencies = LazyLibrary[]
97+
else
98+
_libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
99+
end
100+
const libccolamd = LazyLibrary(_libccolamd_path; dependencies=_libccolamd_dependencies)
101+
102+
if Sys.isfreebsd()
103+
_librbio_dependencies = LazyLibrary[]
104+
else
105+
_librbio_dependencies = LazyLibrary[libsuitesparseconfig]
106+
end
107+
const librbio = LazyLibrary(_librbio_path; dependencies=_librbio_dependencies)
108+
109+
if Sys.isfreebsd()
110+
_libcholmod_dependencies = LazyLibrary[]
111+
else
112+
_libcholmod_dependencies = LazyLibrary[
113+
libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline
114+
]
115+
end
83116
const libcholmod = LazyLibrary(_libcholmod_path; dependencies=_libcholmod_dependencies)
84117

85-
_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
118+
if Sys.isfreebsd()
119+
_libklu_dependencies = LazyLibrary[]
120+
else
121+
_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
122+
end
86123
const libklu = LazyLibrary(_libklu_path; dependencies=_libklu_dependencies)
87124

88125
if Sys.isapple()
89126
_libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline]
90127
else
91-
_libspqr_dependencies = LazyLibrary[libstdcxx, libgcc_s, libsuitesparseconfig, libcholmod, libblastrampoline]
128+
_libspqr_dependencies = LazyLibrary[
129+
libstdcxx, libgcc_s, libsuitesparseconfig, libcholmod, libblastrampoline
130+
]
92131
end
93-
94132
const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
95133

96134
_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
97135
const libumfpack = LazyLibrary(_libumfpack_path; dependencies=_libumfpack_dependencies)
98136

99-
100137
function eager_mode()
101138
libblastrampoline_jll.eager_mode()
102139

0 commit comments

Comments
 (0)