fix freebsd deps

Author: IanButterworth

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

@@ -65,28 +65,22 @@ if @isdefined(_libatomic_path)
 end
 const libgcc_s = LazyLibrary(_libgcc_s_path)
 
-@static if Sys.isfreebsd()
-    _libgfortran_deps = LazyLibrary[]
-else
-    _libgfortran_deps = [libgcc_s]
-    if @isdefined _libquadmath_path
-        const libquadmath = LazyLibrary(_libquadmath_path)
-        push!(_libgfortran_deps, libquadmath)
-    end
+_libgfortran_deps = [libgcc_s]
+if @isdefined _libquadmath_path
+    const libquadmath = LazyLibrary(_libquadmath_path)
+    push!(_libgfortran_deps, libquadmath)
 end
 
 const libgfortran = LazyLibrary(_libgfortran_path, dependencies=_libgfortran_deps)
 
+_libstdcxx_dependencies = LazyLibrary[libgcc_s]
+const libstdcxx = LazyLibrary(_libstdcxx_path, dependencies=_libstdcxx_dependencies)
+
 if Sys.isfreebsd()
     _libstdcxx_dependencies = LazyLibrary[]
-elseif Sys.isapple()
-    _libstdcxx_dependencies = LazyLibrary[libgcc_s]
-elseif Sys.islinux()
-    _libstdcxx_dependencies = LazyLibrary[libgcc_s]
 else
-    _libstdcxx_dependencies = LazyLibrary[libgcc_s, libgfortran]
+    _libstdcxx_dependencies = LazyLibrary[]
 end
-const libstdcxx = LazyLibrary(_libstdcxx_path, dependencies=_libstdcxx_dependencies)
 
 const libgomp = LazyLibrary(_libgomp_path)
 

stdlib/GMP_jll/src/GMP_jll.jl

@@ -30,8 +30,6 @@ const libgmp = LazyLibrary(_libgmp_path)
 
 if Sys.isapple()
     _libgmpxx_dependencies = LazyLibrary[libgmp]
-elseif Sys.isfreebsd()
-    _libgmpxx_dependencies = LazyLibrary[]
 else
     _libgmpxx_dependencies = LazyLibrary[libgmp, libstdcxx, libgcc_s]
 end

stdlib/LibCURL_jll/src/LibCURL_jll.jl

@@ -19,13 +19,9 @@ const LIBPATH_list = String[]
 artifact_dir::String = ""
 libcurl_path::String = ""
 
-if Sys.isfreebsd()
-    _libcurl_dependencies = LazyLibrary[]
-else
-    _libcurl_dependencies = LazyLibrary[libz, libnghttp2, libssh2]
-    if !(Sys.iswindows() || Sys.isapple())
-        append!(_libcurl_dependencies, [libssl, libcrypto])
-    end
+_libcurl_dependencies = LazyLibrary[libz, libnghttp2, libssh2]
+if !(Sys.iswindows() || Sys.isapple())
+    append!(_libcurl_dependencies, [libssl, libcrypto])
 end
 
 if Sys.iswindows()

stdlib/LibGit2_jll/src/LibGit2_jll.jl

@@ -27,13 +27,7 @@ else
     const _libgit2_path = BundledLazyLibraryPath("libgit2.so.1.9")
 end
 
-if Sys.isfreebsd()
-    _libgit2_dependencies = LazyLibrary[]
-elseif Sys.islinux()
-    _libgit2_dependencies = LazyLibrary[libssh2, libssl, libcrypto]
-else
-    _libgit2_dependencies = LazyLibrary[libssh2]
-end
+_libgit2_dependencies = LazyLibrary[libssh2]
 const libgit2 = LazyLibrary(_libgit2_path, dependencies=_libgit2_dependencies)
 
 function eager_mode()

stdlib/LibUnwind_jll/src/LibUnwind_jll.jl

@@ -18,10 +18,11 @@ artifact_dir::String = ""
 libunwind_path::String = ""
 
 const _libunwind_path = BundledLazyLibraryPath("libunwind.so.8")
-_libunwind_dependencies = if Sys.isfreebsd()
-    LazyLibrary[]
+
+if Sys.isfreebsd()
+    _libunwind_dependencies = LazyLibrary[libz]
 else
-    LazyLibrary[libgcc_s, libz]
+    _libunwind_dependencies = LazyLibrary[libgcc_s, libz]
 end
 const libunwind = LazyLibrary(_libunwind_path, dependencies=_libunwind_dependencies)
 

stdlib/MPFR_jll/src/MPFR_jll.jl

@@ -22,11 +22,7 @@ else
     const _libmpfr_path = BundledLazyLibraryPath("libmpfr.so.6")
 end
 
-if Sys.isfreebsd()
-    _libmpfr_dependencies = LazyLibrary[]
-else
-    _libmpfr_dependencies = LazyLibrary[libgmp]
-end
+_libmpfr_dependencies = LazyLibrary[libgmp]
 
 const libmpfr = LazyLibrary(_libmpfr_path, dependencies=_libmpfr_dependencies)
 

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

@@ -29,18 +29,14 @@ else
     const _libopenblas_path = BundledLazyLibraryPath(string("libopenblas", libsuffix, ".so"))
 end
 
+_libopenblas_dependencies = LazyLibrary[libgfortran]
 if Sys.isapple()
-    _libopenblas_dependencies = LazyLibrary[libgfortran]
     if isdefined(CompilerSupportLibraries_jll, :libquadmath)
         push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libquadmath)
     end
     if Sys.ARCH != :aarch64
         push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libgcc_s)
     end
-elseif Sys.isfreebsd()
-    _libopenblas_dependencies = LazyLibrary[]
-else
-    _libopenblas_dependencies = LazyLibrary[libgfortran]
 end
 const libopenblas = LazyLibrary(_libopenblas_path, dependencies=_libopenblas_dependencies)
 

stdlib/OpenSSL_jll/src/OpenSSL_jll.jl

@@ -34,11 +34,7 @@ end
 
 const libcrypto = LazyLibrary(_libcrypto_path)
 
-if Sys.isfreebsd()
-    _libssl_dependencies = LazyLibrary[]
-else
-    _libssl_dependencies = LazyLibrary[libcrypto]
-end
+_libssl_dependencies = LazyLibrary[libcrypto]
 const libssl = LazyLibrary(_libssl_path, dependencies=_libssl_dependencies)
 
 function eager_mode()

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

@@ -71,59 +71,31 @@ const libsuitesparseconfig = LazyLibrary(_libsuitesparseconfig_path)
 const libldl = LazyLibrary(_libldl_path)
 const libbtf = LazyLibrary(_libbtf_path)
 
-if Sys.isfreebsd()
-    _libcolamd_dependencies = LazyLibrary[]
-else
-    _libcolamd_dependencies = LazyLibrary[libsuitesparseconfig]
-end
+_libcolamd_dependencies = LazyLibrary[libsuitesparseconfig]
 const libcolamd = LazyLibrary(_libcolamd_path; dependencies=_libcolamd_dependencies)
 
-if Sys.isfreebsd()
-    _libamd_dependencies = LazyLibrary[]
-else
-    _libamd_dependencies = LazyLibrary[libsuitesparseconfig]
-end
+_libamd_dependencies = LazyLibrary[libsuitesparseconfig]
 const libamd = LazyLibrary(_libamd_path; dependencies=_libamd_dependencies)
 
-if Sys.isfreebsd()
-    _libcamd_dependencies = LazyLibrary[]
-else
-    _libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
-end
+_libcamd_dependencies = LazyLibrary[libsuitesparseconfig]
 const libcamd = LazyLibrary(_libcamd_path; dependencies=_libcamd_dependencies)
 
-if Sys.isfreebsd()
-    _libccolamd_dependencies = LazyLibrary[]
-else
-    _libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
-end
+_libccolamd_dependencies = LazyLibrary[libsuitesparseconfig]
 const libccolamd = LazyLibrary(_libccolamd_path; dependencies=_libccolamd_dependencies)
 
-if Sys.isfreebsd()
-    _librbio_dependencies = LazyLibrary[]
-else
-    _librbio_dependencies = LazyLibrary[libsuitesparseconfig]
-end
+_librbio_dependencies = LazyLibrary[libsuitesparseconfig]
 const librbio = LazyLibrary(_librbio_path; dependencies=_librbio_dependencies)
 
-if Sys.isfreebsd()
-    _libcholmod_dependencies = LazyLibrary[]
-else
-    _libcholmod_dependencies = LazyLibrary[
-        libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline
+_libcholmod_dependencies = LazyLibrary[
+    libsuitesparseconfig, libamd, libcamd, libccolamd, libcolamd, libblastrampoline
     ]
-end
 const libcholmod = LazyLibrary(_libcholmod_path; dependencies=_libcholmod_dependencies)
 
-if Sys.isfreebsd()
-    _libklu_dependencies = LazyLibrary[]
-else
-    _libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
-end
+_libklu_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcolamd, libbtf]
 const libklu = LazyLibrary(_libklu_path; dependencies=_libklu_dependencies)
 
 if Sys.isfreebsd()
-    _libspqr_dependencies = LazyLibrary[]
+    _libspqr_dependencies = LazyLibrary[libcholmod, libblastrampoline, libsuitesparseconfig, libcxx] # libcxxrt ?
 elseif Sys.isapple()
     _libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline]
 else
@@ -133,11 +105,7 @@ else
 end
 const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
 
-if Sys.isfreebsd()
-   _libumfpack_dependencies = LazyLibrary[]
-else
-    _libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
-end
+_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
 const libumfpack = LazyLibrary(_libumfpack_path; dependencies=_libumfpack_dependencies)
 
 function eager_mode()

stdlib/libLLVM_jll/src/libLLVM_jll.jl

@@ -24,7 +24,7 @@ else
 end
 
 if Sys.isfreebsd()
-    _libLLVM_dependencies = LazyLibrary[libzstd]
+    _libLLVM_dependencies = LazyLibrary[libz, libzstd, libcxx, libgcc_s] # libcxxrt ?
 elseif Sys.isapple()
     _libLLVM_dependencies = LazyLibrary[libz, libzstd]
 else

test/stdlib_dependencies.jl

@@ -78,6 +78,19 @@ function is_system_lib_linux(lib)
     return lib ∈ system_libs
 end
 
+function is_system_lib_freebsd(lib)
+    system_libs = [
+        "libc",
+        "libm",
+        "libthr",      # primary threading library
+        "libpthread",  # alias kept for compatibility
+        "librt",
+        "libutil",
+        "libexecinfo",
+    ]
+    return lib ∈ system_libs
+end
+
 function get_deps_readelf(lib_path::String)
     # Split into lines
     libs = split(readchomp(`readelf -d $(lib_path)`), "\n")
@@ -111,7 +124,7 @@ if Sys.islinux() || Sys.isfreebsd()
     end
     get_deps = get_deps_readelf
     strip_soversion = strip_soversion_linux
-    is_system_lib = is_system_lib_linux
+    is_system_lib = Sys.islinux() ? is_system_lib_linux : is_system_lib_freebsd
 elseif Sys.isapple()
     # On macOS, we need `otool` available
     if Sys.which("otool") === nothing