[AutoBuild] Filter out non-build deps before calling setup_dependencies (#1209)

Author: giordano

Manifest.toml

@@ -1,6 +1,6 @@
 # This file is machine-generated - editing it directly is not advised
 
-julia_version = "1.7.2"
+julia_version = "1.7.3"
 manifest_format = "2.0"
 
 [[deps.ArgParse]]
@@ -31,11 +31,11 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[deps.BinaryBuilderBase]]
 deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "LibGit2_jll", "Libdl", "Logging", "OrderedCollections", "OutputCollectors", "Pkg", "ProgressMeter", "Random", "SHA", "Scratch", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll", "pigz_jll"]
-git-tree-sha1 = "515d28b82ab1a721b31ddb6a11f8fa5662fc9e91"
+git-tree-sha1 = "c85100c358dbcd7d918130ab333bf57c7f375f68"
 repo-rev = "master"
 repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
-version = "1.10.1"
+version = "1.12.0"
 
 [[deps.CodecZlib]]
 deps = ["TranscodingStreams", "Zlib_jll"]
@@ -45,18 +45,18 @@ version = "0.7.0"
 
 [[deps.Compat]]
 deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
-git-tree-sha1 = "b153278a25dd42c65abbf4e62344f9d22e59191b"
+git-tree-sha1 = "9be8be1d8a6f44b96482c8af52238ea7987da3e3"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "3.43.0"
+version = "3.45.0"
 
 [[deps.CompilerSupportLibraries_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
 
 [[deps.DataAPI]]
-git-tree-sha1 = "cc70b17275652eb47bc9e5f81635981f13cea5c8"
+git-tree-sha1 = "fb5f5316dd3fd4c5e7c30a24d50643b73e37cd40"
 uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
-version = "1.9.0"
+version = "1.10.0"
 
 [[deps.DataValueInterfaces]]
 git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -76,7 +76,7 @@ deps = ["Random", "Serialization", "Sockets"]
 uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[deps.Downloads]]
-deps = ["ArgTools", "LibCURL", "NetworkOptions"]
+deps = ["ArgTools", "FileWatching", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
 [[deps.ExprTools]]
@@ -86,9 +86,9 @@ version = "0.1.8"
 
 [[deps.FileIO]]
 deps = ["Pkg", "Requires", "UUIDs"]
-git-tree-sha1 = "80ced645013a5dbdc52cf70329399c35ce007fae"
+git-tree-sha1 = "9267e5f50b0e12fdfd5a2455534345c4cf2c7f7a"
 uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-version = "1.13.0"
+version = "1.14.0"
 
 [[deps.FileWatching]]
 uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -187,9 +187,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[deps.LoggingExtras]]
 deps = ["Dates", "Logging"]
-git-tree-sha1 = "dfeda1c1130990428720de0024d4516b1902ce98"
+git-tree-sha1 = "5d4d2d9904227b8bd66386c1138cf4d5ffa826bf"
 uuid = "e6f89c97-d47a-5376-807f-9c37f3926c36"
-version = "0.4.7"
+version = "0.4.9"
 
 [[deps.MacroTools]]
 deps = ["Markdown", "Random"]
@@ -260,9 +260,9 @@ version = "0.1.1"
 
 [[deps.Parsers]]
 deps = ["Dates"]
-git-tree-sha1 = "621f4f3b4977325b9128d5fae7a8b4829a0c2222"
+git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "2.2.4"
+version = "2.3.1"
 
 [[deps.Pidfile]]
 deps = ["FileWatching", "Test"]
@@ -282,9 +282,9 @@ version = "0.2.0"
 
 [[deps.Preferences]]
 deps = ["TOML"]
-git-tree-sha1 = "d3538e7f8a790dc8903519090857ef8e1283eecd"
+git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
 uuid = "21216c6a-2e73-6563-6e65-726566657250"
-version = "1.2.5"
+version = "1.3.0"
 
 [[deps.Printf]]
 deps = ["Unicode"]
@@ -311,15 +311,15 @@ version = "1.2.2"
 
 [[deps.Registrator]]
 deps = ["AutoHashEquals", "Base64", "Dates", "Distributed", "FileWatching", "GitForge", "GitHub", "HTTP", "JSON", "LibGit2", "Logging", "MbedTLS", "Mocking", "Mustache", "Mux", "Pkg", "RegistryTools", "Serialization", "Sockets", "TimeToLive", "UUIDs", "ZMQ"]
-git-tree-sha1 = "8e1a5ac2695627143951512d700c7e3c445102ec"
+git-tree-sha1 = "419649a25cd38e1baab69ad2948870799964a5a3"
 uuid = "4418983a-e44d-11e8-3aec-9789530b3b3e"
-version = "1.2.9"
+version = "1.4.0"
 
 [[deps.RegistryTools]]
 deps = ["AutoHashEquals", "LibGit2", "Pkg", "SHA", "UUIDs"]
-git-tree-sha1 = "7ba3c65d4f40a399e5a2f0ec5abc89de871604e5"
+git-tree-sha1 = "aceb02a844394332608c88d7da6217daf2b5e4e5"
 uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
-version = "1.7.0"
+version = "1.8.1"
 
 [[deps.Requires]]
 deps = ["UUIDs"]

Project.toml

@@ -1,7 +1,7 @@
 name = "BinaryBuilder"
 uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
 authors = ["Elliot Saba <[email protected]>"]
-version = "0.5.4"
+version = "0.5.5"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
@@ -33,7 +33,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
 
 [compat]
 ArgParse = "1.1"
-BinaryBuilderBase = "1.10"
+BinaryBuilderBase = "1.12"
 GitHub = "5.1"
 HTTP = "0.8, 0.9"
 JLD2 = "0.1.6, 0.2, 0.3, 0.4"

docs/src/building.md

@@ -330,6 +330,8 @@ dependencies = [
 
 * [`Dependency`](@ref) specify a JLL package that is necessary to build and load
   the current builder.  Binaries for the target platform will be installed;
+* [`RuntimeDependency`](@ref): a JLL package that is necessary only at runtime.  Its
+  artifact will not be installed in the prefix during the build.
 * [`BuildDependency`](@ref) is a JLL package necessary only to build the current
   package, but not to load it.  This dependency will install binaries for the
   target platforms and will not be added to the list of the dependencies of the
@@ -338,11 +340,11 @@ dependencies = [
   install binaries for the host system.  This kind of dependency is usually
   added to provide some binary utilities to run during the build process.
 
-The argument of `Dependency`, `BuildDependency`, and `HostBuildDependency` can
-also be a `Pkg.PackageSpec`, with which you can specify more details about the
-dependency, like a version number, or also a non-registered package.  Note that
-in Yggdrasil only JLL packages in the [General
-registry](https://github.com/JuliaRegistries/General) can be accepted.
+The argument of `Dependency`, `RuntimeDependency`, `BuildDependency`, and
+`HostBuildDependency` can also be a `Pkg.PackageSpec`, with which you can
+specify more details about the dependency, like a version number, or also a
+non-registered package.  Note that in Yggdrasil only JLL packages in the
+[General registry](https://github.com/JuliaRegistries/General) can be accepted.
 
 The dependencies for the target system (`Dependency` and `BuildDependency`) will
 be installed under `${prefix}` within the build environment, while the
@@ -358,7 +360,7 @@ Examples of builders that depend on other binaries include:
   depends on `Xorg_libxcb_jll`, and `Xorg_xtrans_jll` at build- and run-time,
   and on `Xorg_xorgproto_jll` and `Xorg_util_macros_jll` only at build-time.
 
-### Platform-dependent dependencies
+### Platform-specific dependencies
 
 By default, all dependencies are used for all platforms, but there are some
 cases where a package requires some dependencies only on some platforms.  You

src/AutoBuild.jl

@@ -785,7 +785,7 @@ function autobuild(dir::AbstractString,
             verbose=verbose,
         )
         setup_deps(f, prefix, dependencies, platform, verbose) =
-            setup_dependencies(prefix, Pkg.Types.PackageSpec[getpkg(d) for d in filter_platforms(dependencies, platform) if f(d)], platform; verbose)
+            setup_dependencies(prefix, Pkg.Types.PackageSpec[getpkg(d) for d in filter_platforms(dependencies, platform) if f(d) && is_build_dependency(d)], platform; verbose)
         host_artifact_paths = setup_deps(is_host_dependency, prefix, dependencies, default_host_platform, verbose)
         target_artifact_paths = setup_deps(is_target_dependency, prefix, dependencies, concrete_platform, verbose)
 

src/BinaryBuilder.jl

@@ -22,7 +22,7 @@ export AnyPlatform
 export Product, LibraryProduct, FileProduct, ExecutableProduct, FrameworkProduct, satisfied,
        locate, write_deps_file, variable_name
 # BinaryBuilderBase/src/Dependency.jl
-export Dependency, BuildDependency, HostBuildDependency
+export Dependency, RuntimeDependency, BuildDependency, HostBuildDependency
 # BinaryBuilderBase/src/Sources.jl
 export ArchiveSource, FileSource, GitSource, DirectorySource
 # Auditor.jl