Skip to content

FreeBSD bootstrap #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Nov 12, 2025
Merged

FreeBSD bootstrap #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7321230
Split Binutils out into its own toolchain
staticfloat Aug 16, 2025
4f39ea9
BinaryBuilderSources: Improve JLLSource caching
staticfloat Sep 8, 2025
4146238
Firm up FreeBSD versioning
staticfloat Sep 23, 2025
d1862f2
Burst JLLSource cache when a dependency is built in the Universe
staticfloat Sep 23, 2025
9843760
Bootstrap fixes for FreeBSD
staticfloat Sep 23, 2025
2c100f5
Rework bootstrap ordering for FreeBSD
staticfloat Oct 5, 2025
9c1ce2c
Fix `bb2/nothing` default branch name
staticfloat Sep 23, 2025
6417412
Improve errors when JLL.toml can't be loaded
staticfloat Sep 8, 2025
7944abf
Print more informative error when failing to hit build cache
staticfloat Sep 23, 2025
9e69051
Allow JLLPrefixes v0.4.X
staticfloat Sep 6, 2025
43d9ad1
Manifest upgrade
staticfloat Sep 23, 2025
54e101c
Add `Base.show()` method for `BuildCache`
staticfloat Oct 5, 2025
b7931fb
Improve catching errors in BB2 itself with `--debug`
staticfloat Oct 5, 2025
06d93ab
Allow passing arguments in our `run_build_tarballs()` function
staticfloat Oct 5, 2025
82d6f60
Backing up FreeBSD bootstrapping work
staticfloat Oct 26, 2025
48a1de5
Auditor: Change `print_results()` to just `show()`
staticfloat Nov 9, 2025
e736e99
Toolchains: Version macOS and FreeBSD platforms
staticfloat Nov 9, 2025
75a2878
Finish FreeBSD bootstrap
staticfloat Nov 9, 2025
5c40438
Add `Maintenance.clear_sources_cache()`
staticfloat Nov 9, 2025
77095e5
Switch back to `v1.11` for CI for now
staticfloat Nov 9, 2025
17267e8
PlatformExtensions: fix tests
staticfloat Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 29 additions & 23 deletions BinaryBuilderAuditor.jl/Manifest.toml
View file
Open in desktop
Copy link
Member

@giordano giordano Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering: are these manifests needed to be able to refer to the other local packages? If so, using the [sources] section of Project.toml is a saner way to do it, and you can get rid of checked in manifests.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.11.6"
julia_version = "1.11.7"
manifest_format = "2.0"
project_hash = "f0465bc14e77aee28eba0944a179c9c65f95a304"

Expand Down Expand Up @@ -41,7 +41,7 @@ uuid = "21737265-7a69-6e4f-4974-6375646f7270"
version = "0.1.0"

[[deps.BinaryBuilderSources]]
deps = ["BinaryBuilderGitUtils", "Dates", "Downloads", "Git", "JLLPrefixes", "MultiHashParsing", "Pkg", "Random", "SHA", "Scratch", "TimerOutputs", "TreeArchival"]
deps = ["BinaryBuilderGitUtils", "Dates", "Downloads", "Git", "JLLPrefixes", "MultiHashParsing", "Pkg", "Random", "SHA", "Scratch", "TOML", "TimerOutputs", "TreeArchival"]
path = "../BinaryBuilderSources.jl"
uuid = "316c416d-4527-6863-7465-466137743047"
version = "0.1.0"
Expand All @@ -54,9 +54,9 @@ version = "0.2.0"

[[deps.Compat]]
deps = ["TOML", "UUIDs"]
git-tree-sha1 = "3a3dfb30697e96a440e4149c8c51bf32f818c0f3"
git-tree-sha1 = "0037835448781bb46feb39866934e243886d756a"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "4.17.0"
version = "4.18.0"

[deps.Compat.extensions]
CompatLinearAlgebraExt = "LinearAlgebra"
Expand All @@ -77,9 +77,9 @@ version = "1.6.0"

[[deps.Expat_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "d55dffd9ae73ff72f1c0482454dcf2ec6c6c4a63"
git-tree-sha1 = "7bb1361afdb33c7f2b085aa49ea8fe1b0fb14e58"
uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
version = "2.6.5+0"
version = "2.7.1+0"

[[deps.ExprTools]]
git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec"
Expand All @@ -91,24 +91,30 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
version = "1.11.0"

[[deps.Git]]
deps = ["Git_jll", "JLLWrappers", "OpenSSH_jll"]
git-tree-sha1 = "2230a9cc32394b11a3b3aa807a382e3bbab1198c"
deps = ["Git_LFS_jll", "Git_jll", "JLLWrappers", "OpenSSH_jll"]
git-tree-sha1 = "824a1890086880696fc908fe12a17bcf61738bd8"
uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
version = "1.4.0"
version = "1.5.0"

[[deps.Git_LFS_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "bb8471f313ed941f299aa53d32a94ab3bee08844"
uuid = "020c3dae-16b3-5ae5-87b3-4cb189e250b2"
version = "3.7.0+0"

[[deps.Git_jll]]
deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"]
git-tree-sha1 = "cb151153e40ad40a6dbf984fcd767e1d266fcc9c"
git-tree-sha1 = "e2aef26f7d273f1e5b1daba56837c47b49b4388f"
uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb"
version = "2.50.1+0"
version = "2.51.1+0"

[[deps.HistoricalStdlibVersions]]
deps = ["Pkg", "PrecompileTools"]
git-tree-sha1 = "1c2bfcc3d0ad9628a0fc247a267d8b06153182d4"
git-tree-sha1 = "4e7f6506af8fab111202d306abc5aab5c8d1d8ac"
repo-rev = "main"
repo-url = "https://github.com/JuliaPackaging/HistoricalStdlibVersions.jl.git"
uuid = "6df8b67a-e8a0-4029-b4b7-ac196fe72102"
version = "2.0.3"
version = "2.0.4"

[[deps.InteractiveUtils]]
deps = ["Markdown"]
Expand All @@ -127,15 +133,15 @@ weakdeps = ["BinaryBuilderSources"]

[[deps.JLLPrefixes]]
deps = ["Artifacts", "Git", "HistoricalStdlibVersions", "Pkg", "Preferences", "SHA", "Scratch"]
git-tree-sha1 = "c199272df7cab0230eb6febc3003c87873599107"
git-tree-sha1 = "3b772c89f2fb0f2877e9149d3f529276ca8b33f2"
uuid = "afc68a34-7891-4c5a-9da1-1c62935e7b0d"
version = "0.3.13"
version = "0.4.1"

[[deps.JLLWrappers]]
deps = ["Artifacts", "Preferences"]
git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6"
git-tree-sha1 = "0533e564aae234aff59ab625543145446d8b6ec2"
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
version = "1.7.0"
version = "1.7.1"

[[deps.KeywordArgumentExtraction]]
deps = ["ExprTools", "InteractiveUtils"]
Expand Down Expand Up @@ -226,15 +232,15 @@ version = "0.4.4"

[[deps.OpenSSH_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "OpenSSL_jll", "Zlib_jll"]
git-tree-sha1 = "cb7acd5d10aff809b4d0191dfe1956c2edf35800"
git-tree-sha1 = "1f2f0911e1c02f28a390bb720f97f3349c4dcefb"
uuid = "9bd350c2-7e96-507f-8002-3f2e150b4e1b"
version = "10.0.1+0"
version = "10.0.2+0"

[[deps.OpenSSL_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "87510f7292a2b21aeff97912b0898f9553cc5c2c"
git-tree-sha1 = "2ae7d4ddec2e13ad3bddf5c0796f7547cf682391"
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
version = "3.5.1+0"
version = "3.5.2+0"

[[deps.OrderedCollections]]
git-tree-sha1 = "05868e21324cede2207c6f0f466b4bfef6d5e7ee"
Expand Down Expand Up @@ -265,9 +271,9 @@ version = "1.2.1"

[[deps.Preferences]]
deps = ["TOML"]
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d"
uuid = "21216c6a-2e73-6563-6e65-726566657250"
version = "1.4.3"
version = "1.5.0"

[[deps.Printf]]
deps = ["Unicode"]
Expand Down
6 changes: 3 additions & 3 deletions BinaryBuilderAuditor.jl/src/AuditResult.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using JLLGenerator, StyledStrings
export PassResult, AuditResult, print_results, success
export PassResult, AuditResult, success

struct PassResult
# One of `:success`, `:warn` or `:fail`
Expand Down Expand Up @@ -42,8 +42,8 @@ function status_style(status::Symbol)
)[status]
end

print_results(ar::AuditResult; kwargs...) = print_results(ar.pass_results; kwargs...)
function print_results(pass_results::Dict{String,Vector{PassResult}}; io::IO = stdout)
Base.show(io::IO, ar::AuditResult) = show(io, ar.pass_results)
function Base.show(io::IO, pass_results::Dict{String,Vector{PassResult}})
println(io, "Audit results:")
for (name, results) in pass_results
println(io, " -> $(name) ($(length(results)) entries)")
Expand Down
2 changes: 1 addition & 1 deletion BinaryBuilderAuditor.jl/src/AuditorToolchain.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct AuditorToolchain <: AbstractToolchain
platform;
uuid=Base.UUID("1e42d1a4-ec21-5f39-ae07-c1fb720fbc4b"),
repo=Pkg.Types.GitRepo(
rev="main",
rev="bb2/GCCBootstrap-x86_64-linux-gnu",
source="https://github.com/staticfloat/CCTools_jll.jl",
),
# eventually, include a resolved version
Expand Down
2 changes: 1 addition & 1 deletion BinaryBuilderAuditor.jl/src/BinaryBuilderAuditor.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function audit!(prefix::String,
licenses_present(scan, pass_results)

if verbose
print_results(pass_results)
show(pass_results)
end

# Cleanup temporary directories containing toolchains
Expand Down
13 changes: 12 additions & 1 deletion BinaryBuilderAuditor.jl/src/SystemLibraries.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ function is_system_library(soname::AbstractString, platform::AbstractPlatform)
"libpmsample.dylib",
"libsandbox.1.dylib",
"libsystem.b.dylib",
# This is not built by clang or GCC, so we leave it as a system library
"libc++.1.dylib",
"libstdc++.6.dylib",
"libresolv.9.dylib",
# Frameworks in the SDK
"accelerate",
Expand Down Expand Up @@ -181,6 +181,17 @@ function is_system_library(soname::AbstractString, platform::AbstractPlatform)
"libexecinfo.so.1",
"libkvm.so.7",
"libutil.so.9",
"libc.so.7",
"libc.so.6",
"libthr.so.3",
"libm.so.5",
"libm.so.6",

# compiler support libraries
"libc++.so.1",
"libcxxrt.so.1",
"libgcc_s.so.1",
"libstdc++.so.6",
]
return lowercase(soname) ∈ sdk_libs
else
Expand Down
2 changes: 1 addition & 1 deletion BinaryBuilderAuditor.jl/test/passes/DynamicLinkageTests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function soname_flag(platform, soname)
end

# We're gonna make use of a C toolchain for lots of these tests
for target_platform in (Platform("x86_64", "linux"), Platform("aarch64", "macos"))
for target_platform in (Platform("x86_64", "linux"), Platform("aarch64", "macos"; os_version=v"20"))
platform = CrossPlatform(BBHostPlatform() => target_platform)
toolchain = CToolchain(platform; use_ccache=false)

Expand Down
4 changes: 2 additions & 2 deletions BinaryBuilderAuditor.jl/test/passes/LibrarySONAMETests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function make_libfoo(prefix, target)
end

@testset "ensure_sonames" begin
for target in (Platform("x86_64", "linux"), Platform("aarch64", "macos"))
for target in (Platform("x86_64", "linux"), Platform("aarch64", "macos"; os_version=v"20"))
mktempdir() do prefix
libfoo_path = make_libfoo(prefix, target)

Expand Down Expand Up @@ -59,7 +59,7 @@ end
ensure_sonames!(scan, pass_results)
@test !success(pass_results)
io = IOBuffer()
print_results(pass_results; io)
show(io, pass_results)
@test occursin("Failed to set SONAME:", String(take!(io)))
@test any(r.identifier == relpath(libfoo_path, prefix) && r.status == :fail for r in pass_results["ensure_sonames!"])
end
Expand Down
2 changes: 1 addition & 1 deletion BinaryBuilderAuditor.jl/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Test, BinaryBuilderAuditor, JLLGenerator, BinaryBuilderToolchains, TreeArchival
using Test, BinaryBuilderProducts, BinaryBuilderAuditor, JLLGenerator, BinaryBuilderToolchains, TreeArchival

include("ScanningTests.jl")
include("passes/RelativeSymlinkTests.jl")
Expand Down
38 changes: 22 additions & 16 deletions BinaryBuilderGitUtils.jl/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.11.6"
julia_version = "1.11.7"
manifest_format = "2.0"
project_hash = "5065db5cbc116447b19556c4543ba261ca11385f"

Expand All @@ -15,27 +15,33 @@ version = "1.11.0"

[[deps.Expat_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "d55dffd9ae73ff72f1c0482454dcf2ec6c6c4a63"
git-tree-sha1 = "7bb1361afdb33c7f2b085aa49ea8fe1b0fb14e58"
uuid = "2e619515-83b5-522b-bb60-26c02a35a201"
version = "2.6.5+0"
version = "2.7.1+0"

[[deps.Git]]
deps = ["Git_jll", "JLLWrappers", "OpenSSH_jll"]
git-tree-sha1 = "2230a9cc32394b11a3b3aa807a382e3bbab1198c"
deps = ["Git_LFS_jll", "Git_jll", "JLLWrappers", "OpenSSH_jll"]
git-tree-sha1 = "824a1890086880696fc908fe12a17bcf61738bd8"
uuid = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
version = "1.4.0"
version = "1.5.0"

[[deps.Git_LFS_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "bb8471f313ed941f299aa53d32a94ab3bee08844"
uuid = "020c3dae-16b3-5ae5-87b3-4cb189e250b2"
version = "3.7.0+0"

[[deps.Git_jll]]
deps = ["Artifacts", "Expat_jll", "JLLWrappers", "LibCURL_jll", "Libdl", "Libiconv_jll", "OpenSSL_jll", "PCRE2_jll", "Zlib_jll"]
git-tree-sha1 = "cb151153e40ad40a6dbf984fcd767e1d266fcc9c"
git-tree-sha1 = "e2aef26f7d273f1e5b1daba56837c47b49b4388f"
uuid = "f8c6e375-362e-5223-8a59-34ff63f689eb"
version = "2.50.1+0"
version = "2.51.1+0"

[[deps.JLLWrappers]]
deps = ["Artifacts", "Preferences"]
git-tree-sha1 = "a007feb38b422fbdab534406aeca1b86823cb4d6"
git-tree-sha1 = "0533e564aae234aff59ab625543145446d8b6ec2"
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
version = "1.7.0"
version = "1.7.1"

[[deps.LibCURL_jll]]
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
Expand Down Expand Up @@ -70,15 +76,15 @@ version = "0.1.0"

[[deps.OpenSSH_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "OpenSSL_jll", "Zlib_jll"]
git-tree-sha1 = "cb7acd5d10aff809b4d0191dfe1956c2edf35800"
git-tree-sha1 = "1f2f0911e1c02f28a390bb720f97f3349c4dcefb"
uuid = "9bd350c2-7e96-507f-8002-3f2e150b4e1b"
version = "10.0.1+0"
version = "10.0.2+0"

[[deps.OpenSSL_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
git-tree-sha1 = "87510f7292a2b21aeff97912b0898f9553cc5c2c"
git-tree-sha1 = "2ae7d4ddec2e13ad3bddf5c0796f7547cf682391"
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
version = "3.5.1+0"
version = "3.5.2+0"

[[deps.PCRE2_jll]]
deps = ["Artifacts", "Libdl"]
Expand All @@ -87,9 +93,9 @@ version = "10.42.0+1"

[[deps.Preferences]]
deps = ["TOML"]
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d"
uuid = "21216c6a-2e73-6563-6e65-726566657250"
version = "1.4.3"
version = "1.5.0"

[[deps.Printf]]
deps = ["Unicode"]
Expand Down
6 changes: 3 additions & 3 deletions BinaryBuilderPlatformExtensions.jl/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.11.6"
julia_version = "1.11.7"
manifest_format = "2.0"
project_hash = "02c91ea86434b619a90551de48dcdc5edac5866c"

Expand All @@ -22,9 +22,9 @@ version = "1.2.1"

[[deps.Preferences]]
deps = ["TOML"]
git-tree-sha1 = "9306f6085165d270f7e3db02af26a400d580f5c6"
git-tree-sha1 = "0f27480397253da18fe2c12a4ba4eb9eb208bf3d"
uuid = "21216c6a-2e73-6563-6e65-726566657250"
version = "1.4.3"
version = "1.5.0"

[[deps.Printf]]
deps = ["Unicode"]
Expand Down
3 changes: 3 additions & 0 deletions BinaryBuilderPlatformExtensions.jl/src/Microarchitectures.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ const ARCHITECTURE_FLAGS = Dict(
#"power9" => ["-mcpu=power9", "-mtune=power9"],
# Eventually, we'll support power10, once we have compilers that support it.
#"power10" => ["-mcpu=power10", "-mtune=power10"],
),
"riscv64" => OrderedDict(
"riscv64" => ["-march=rv64gc"],
)
),
"gcc" => Dict(
Expand Down
Loading