morefix

Author: IanButterworth

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

@@ -5,7 +5,7 @@
 baremodule CompilerSupportLibraries_jll
 using Base, Libdl, Base.BinaryPlatforms
 
-export libgfortran, libstdcxx, libgomp, libatomic, libgcc_s, libquadmath
+export libgfortran, libstdcxx, libgomp, libatomic, libgcc_s
 
 # These get calculated in __init__()
 const PATH = Ref("")

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

@@ -30,7 +30,10 @@ else
 end
 
 if Sys.isapple()
-    _libopenblas_dependencies = LazyLibrary[libquadmath, libgfortran]
+    _libopenblas_dependencies = LazyLibrary[libgfortran]
+    if isdefined(CompilerSupportLibraries_jll, :libquadmath)
+        push!(_libopenblas_dependencies, CompilerSupportLibraries_jll.libquadmath)
+    end
 elseif Sys.isfreebsd()
     _libopenblas_dependencies = LazyLibrary[]
 else

stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl

@@ -122,7 +122,9 @@ else
 end
 const libklu = LazyLibrary(_libklu_path; dependencies=_libklu_dependencies)
 
-if Sys.isapple()
+if Sys.isfreebsd()
+    _libspqr_dependencies = LazyLibrary[]
+elseif Sys.isapple()
     _libspqr_dependencies = LazyLibrary[libsuitesparseconfig, libcholmod, libblastrampoline]
 else
     _libspqr_dependencies = LazyLibrary[
@@ -131,7 +133,11 @@ else
 end
 const libspqr = LazyLibrary(_libspqr_path; dependencies=_libspqr_dependencies)
 
-_libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
+if Sys.isfreebsd()
+   _libumfpack_dependencies = LazyLibrary[]
+else
+    _libumfpack_dependencies = LazyLibrary[libsuitesparseconfig, libamd, libcholmod, libblastrampoline]
+end
 const libumfpack = LazyLibrary(_libumfpack_path; dependencies=_libumfpack_dependencies)
 
 function eager_mode()

stdlib/libLLVM_jll/src/libLLVM_jll.jl

@@ -23,7 +23,9 @@ else
     const _libLLVM_path = BundledLazyLibraryPath("$(Base.libllvm_name).so")
 end
 
-if Sys.isapple()
+if Sys.isfreebsd()
+    _libLLVM_dependencies = LazyLibrary[]
+elseif Sys.isapple()
     _libLLVM_dependencies = LazyLibrary[libz]
 else
     _libLLVM_dependencies = LazyLibrary[libstdcxx, libgcc_s, libz]