dep fixes

Author: IanButterworth

stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl

@@ -81,6 +81,8 @@ 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]
 end

stdlib/LibGit2_jll/src/LibGit2_jll.jl

@@ -19,16 +19,21 @@ const LIBPATH_list = String[]
 artifact_dir::String = ""
 libgit2_path::String = ""
 
-_libgit2_dependencies = LazyLibrary[libssh2]
 if Sys.iswindows()
     const _libgit2_path = BundledLazyLibraryPath("libgit2.dll")
 elseif Sys.isapple()
     const _libgit2_path = BundledLazyLibraryPath("libgit2.1.9.dylib")
 else
     const _libgit2_path = BundledLazyLibraryPath("libgit2.so.1.9")
-    append!(_libgit2_dependencies, [libcrypto, libssl])
 end
 
+if Sys.isfreebsd()
+    _libgit2_dependencies = LazyLibrary[]
+elseif Sys.islinux()
+    _libgit2_dependencies = LazyLibrary[libssh2, libssl, libcrypto]
+else
+    _libgit2_dependencies = LazyLibrary[libssh2]
+end
 const libgit2 = LazyLibrary(_libgit2_path, dependencies=_libgit2_dependencies)
 
 function eager_mode()

stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl

@@ -34,6 +34,9 @@ if Sys.isapple()
     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

test/stdlib_dependencies.jl

@@ -101,12 +101,12 @@ function get_deps_readelf(lib_path::String)
 end
 
 
-
+skip = false
 # On linux, we need `readelf` available, otherwise we refuse to attempt this
 if Sys.islinux() || Sys.isfreebsd()
     if Sys.which("readelf") === nothing
         @debug("Silently skipping stdlib_dependencies.jl as `readelf` not available.")
-        exit(0)
+        skip = true
     end
     get_deps = get_deps_readelf
     strip_soversion = strip_soversion_linux
@@ -115,63 +115,66 @@ elseif Sys.isapple()
     # On macOS, we need `otool` available
     if Sys.which("otool") === nothing
         @debug("Silently skipping stdlib_dependencies.jl as `otool` not available.")
-        exit(0)
+        skip = true
     end
     get_deps = get_deps_otool
     strip_soversion = strip_soversion_macos
     is_system_lib = is_system_lib_macos
 else
     @debug("Don't know how to run `stdlib_dependencies.jl` on this platform")
-    exit(0)
+    skip = true
 end
 
-# Iterate over all JLL stdlibs, check their lazy libraries to ensure
-# that they list all valid library dependencies, avoiding a situation
-# where the JLL wrapper code has fallen out of sync with the binaries
-# themselves.
-@testset "Stdlib JLL dependency check" begin
-    for (_, (stdlib_name, _)) in Pkg.Types.stdlibs()
-        if !endswith(stdlib_name, "_jll")
-            continue
-        end
-
-        # Import the stdlib, skip it if it's not available on this platform
-        m = eval(Meta.parse("import $(stdlib_name); $(stdlib_name)"))
-        if !Base.invokelatest(getproperty(m, :is_available))
-            continue
-        end
-
-        for prop_name in names(m)
-            prop = getproperty(m, prop_name)
-            if isa(prop, Libdl.LazyLibrary)
-                lib_path = dlpath(prop)
-                lazy_lib_deps = strip_soversion.(basename.(dlpath.(prop.dependencies)))
-                real_lib_deps = filter(!is_system_lib, get_deps(lib_path))
-
-                # See if there are missing dependencies in the lazy library deps
-                missing_deps = setdiff(real_lib_deps, lazy_lib_deps)
-                extraneous_deps = setdiff(lazy_lib_deps, real_lib_deps)
-
-                # We expect there to be no missing or extraneous deps
-                deps_mismatch = !isempty(missing_deps) || !isempty(extraneous_deps)
-
-                # This is a manually-managed special case
-                if stdlib_name == "libblastrampoline_jll" &&
-                   prop_name == :libblastrampoline &&
-                   extraneous_deps == ["libopenblas64_"]
-                    deps_mismatch = false
-                end
+if !skip
+    # Iterate over all JLL stdlibs, check their lazy libraries to ensure
+    # that they list all valid library dependencies, avoiding a situation
+    # where the JLL wrapper code has fallen out of sync with the binaries
+    # themselves.
+    @testset "Stdlib JLL dependency check" begin
+        for (_, (stdlib_name, _)) in Pkg.Types.stdlibs()
+            if !endswith(stdlib_name, "_jll")
+                continue
+            end
 
-                @test !deps_mismatch
+            # Import the stdlib, skip it if it's not available on this platform
+            m = eval(Meta.parse("import $(stdlib_name); $(stdlib_name)"))
+            if !Base.invokelatest(getproperty(m, :is_available))
+                continue
+            end
 
-                # Print out the deps mismatch if we find one
-                if deps_mismatch
-                    @warn("Dependency mismatch",
-                        jll=stdlib_name,
-                        library=string(prop_name),
-                        missing_deps=join(missing_deps, ", "),
-                        extraneous_deps=join(extraneous_deps, ", "),
-                    )
+            for prop_name in names(m)
+                prop = getproperty(m, prop_name)
+                if isa(prop, Libdl.LazyLibrary)
+                    lib_path = dlpath(prop)
+                    lazy_lib_deps = strip_soversion.(basename.(dlpath.(prop.dependencies)))
+                    real_lib_deps = filter(!is_system_lib, get_deps(lib_path))
+
+                    # See if there are missing dependencies in the lazy library deps
+                    missing_deps = setdiff(real_lib_deps, lazy_lib_deps)
+                    extraneous_deps = setdiff(lazy_lib_deps, real_lib_deps)
+
+                    # We expect there to be no missing or extraneous deps
+                    deps_mismatch = !isempty(missing_deps) || !isempty(extraneous_deps)
+
+                    # This is a manually-managed special case
+                    if stdlib_name == "libblastrampoline_jll" &&
+                    prop_name == :libblastrampoline &&
+                    extraneous_deps == ["libopenblas64_"]
+                        deps_mismatch = false
+                    end
+
+                    @test !deps_mismatch
+
+                    # Print out the deps mismatch if we find one
+                    if deps_mismatch
+                        @warn("Dependency mismatch",
+                            jll=stdlib_name,
+                            library=string(prop_name),
+                            missing_deps=join(missing_deps, ", "),
+                            extraneous_deps=join(extraneous_deps, ", "),
+                            actual_deps=join(real_lib_deps, ", "),
+                        )
+                    end
                 end
             end
         end