build_tarballs: accept dependencies with UUID's specified in the PackageSpec.

Author: fredrikekre

src/wizard/utils.jl

@@ -246,7 +246,7 @@ end
 
 with_logfile(f::Function, prefix::Prefix, name::String) = with_logfile(f, joinpath(logdir(prefix), name))
 function with_logfile(f::Function, logfile::String)
-    mkpath(dirname(logfile))    
+    mkpath(dirname(logfile))
 
     # If it's already a file, remove it, as it is probably an incorrect symlink
     if isfile(logfile)
@@ -278,14 +278,19 @@ function resolve_jlls(dependencies::Vector; ctx = Pkg.Types.Context(), outs=stdo
     # Don't clobber caller
     dependencies = deepcopy(dependencies)
 
-    update_registry(ctx)
     pkgspecify(name::AbstractString) = Pkg.Types.PackageSpec(;name=name)
     pkgspecify(ps::Pkg.Types.PackageSpec) = ps
 
     # Convert all dependencies to `PackageSpec`s
     dependencies = pkgspecify.(dependencies)
 
+    # If all dependencies already have a UUID, return early
+    if all(x->x.uuid !== nothing, dependencies)
+        return true, dependencies
+    end
+
     # Resolve, returning the newly-resolved dependencies
+    update_registry(ctx)
     dependencies = Pkg.Types.registry_resolve!(ctx.env, dependencies)
 
     # But first, check to see if anything failed to resolve, and warn about it:

test/basic.jl

@@ -1,6 +1,6 @@
 ## Basic tests for simple utilities within BB
 using BinaryBuilder, Test, Pkg
-using BinaryBuilder: preferred_runner
+using BinaryBuilder: preferred_runner, resolve_jlls
 
 
 @testset "File Collection" begin
@@ -14,7 +14,7 @@ using BinaryBuilder: preferred_runner
         d_link = joinpath(prefix, "bar_link")
         mkpath(d)
         symlink(d, d_link)
-        
+
         files = collect_files(prefix)
         @test length(files) == 2
         @test realpath(f) in files
@@ -283,3 +283,30 @@ end
         @test_throws Base.IOError realpath(joinpath(dstdir, "sym_fileB"))
     end
 end
+
+@testset "resolve_jlls" begin
+    # Deps given by name::String
+    dependencies = ["OpenSSL_jll",]
+    truefalse, resolved_deps = resolve_jlls(dependencies)
+    @test truefalse
+    @test all(x->x.uuid !== nothing, resolved_deps)
+    # Deps given by name::PackageSpec
+    dependencies = [PackageSpec(name="OpenSSL_jll"),]
+    truefalse, resolved_deps = resolve_jlls(dependencies)
+    @test truefalse
+    @test all(x->x.uuid !== nothing, resolved_deps)
+    # Deps given by (name,uuid)::PackageSpec
+    dependencies = [PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"),]
+    truefalse, resolved_deps = resolve_jlls(dependencies)
+    @test truefalse
+    @test all(x->x.uuid !== nothing, resolved_deps)
+    # Deps given by combination of name::String, name::PackageSpec and (name,uuid)::PackageSpec
+    dependencies = [
+        "Zlib_jll",
+        PackageSpec(name="Bzip2_jll"),
+        PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"),
+    ]
+    truefalse, resolved_deps = resolve_jlls(dependencies)
+    @test truefalse
+    @test all(x->x.uuid !== nothing, resolved_deps)
+end