Merge branch 'master' into eschnett/riscv64

Author: eschnett

Artifacts.toml

@@ -1,7 +1,7 @@
 name = "BinaryBuilderBase"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
 authors = ["Elliot Saba <[email protected]>"]
-version = "1.30.0"
+version = "1.32.0"
 
 [deps]
 Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
@@ -41,7 +41,7 @@ Bzip2_jll = "1.0.8"
 CodecZlib = "0.5, 0.6, 0.7"
 Downloads = "1.5"
 Gzip_jll = "1.12.0"
-HistoricalStdlibVersions = "0.1, 1"
+HistoricalStdlibVersions = "2"
 InteractiveUtils = "1.7"
 JLLWrappers = "1.4"
 JSON = "0.21"

Project.toml

@@ -4,7 +4,7 @@ using Pkg, Pkg.Artifacts, Random, Libdl, InteractiveUtils
 using Base.BinaryPlatforms
 using Downloads
 using JSON, OutputCollectors, Scratch
-using HistoricalStdlibVersions
+import HistoricalStdlibVersions
 
 # Re-export useful stuff from Base.BinaryPlatforms:
 export HostPlatform, platform_dlext, valid_dl_path, arch, libc,
@@ -222,8 +222,8 @@ function __init__()
         use_ccache[] = true
     end
 
-    # Populate `Pkg.Types.STDLIBS_BY_VERSION`
-    append!(empty!(Pkg.Types.STDLIBS_BY_VERSION), HistoricalStdlibVersions.STDLIBS_BY_VERSION)
+    # Populate `Pkg.Types.STDLIBS_BY_VERSION`.
+    HistoricalStdlibVersions.register!()
 end
 
 

src/BinaryBuilderBase.jl

@@ -466,6 +466,11 @@ function gcc_version(p::AbstractPlatform,GCC_builds::Vector{GCCBuild},
         GCC_builds = filter(b -> getversion(b) ≥ v"6", GCC_builds)
     end
 
+    # We don't have GCC 6 or older for FreeBSD AArch64
+    if Sys.isfreebsd(p) && arch(p) == "aarch64"
+        GCC_builds = filter(b -> getversion(b) ≥ v"7", GCC_builds)
+    end
+
     # Rust on Windows requires binutils 2.25 (it invokes `ld` with `--high-entropy-va`),
     # which we bundle with GCC 5.
     if :rust in compilers && Sys.iswindows(p)
@@ -560,7 +565,7 @@ function choose_shards(p::AbstractPlatform;
             compilers::Vector{Symbol} = [:c],
             # We always just use the latest Rootfs embedded within our Artifacts.toml
             rootfs_build::VersionNumber=last(BinaryBuilderBase.get_available_builds("Rootfs")),
-            ps_build::VersionNumber=v"2023.06.10",
+            ps_build::VersionNumber=v"2024.08.10",
             GCC_builds::Vector{GCCBuild}=available_gcc_builds,
             LLVM_builds::Vector{LLVMBuild}=available_llvm_builds,
             Rust_build::VersionNumber=maximum(getversion.(available_rust_builds)),
@@ -726,6 +731,7 @@ function supported_platforms(;exclude::Union{Vector{<:Platform},Function}=Return
         Platform("x86_64", "macos"),
         Platform("aarch64", "macos"),
         Platform("x86_64", "freebsd"),
+        Platform("aarch64", "freebsd"),
 
         # Windows
         Platform("i686", "windows"),
@@ -766,6 +772,8 @@ function expand_gfortran_versions(platform::AbstractPlatform)
     local libgfortran_versions
     if Sys.isapple(platform) && arch(platform) == "aarch64"
         libgfortran_versions = [v"5"]
+    elseif Sys.isfreebsd(platform) && arch(platform) == "aarch64"
+        libgfortran_versions = [v"4", v"5"]
     else
         libgfortran_versions = [v"3", v"4", v"5"]
     end

src/Rootfs.jl

@@ -310,7 +310,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
         if length(unsafe_flags) >= 1
             write(io, """
             if [[ "\${ARGS[@]}" =~ \"$(join(unsafe_flags, "\"|\""))\" ]]; then
-                echo -e \"BinaryBuilder: You used one or more of the unsafe flags: $(join(unsafe_flags, ", "))\\nPlease repent.\" >&2
+                echo -e \"BinaryBuilder error: You used one or more of the unsafe flags: $(join(unsafe_flags, ", "))\\nThis is not allowed, please remove all unsafe flags from your build script to continue.\" >&2
                 exit 1
             fi
             """)
@@ -1285,12 +1285,10 @@ function platform_envs(platform::AbstractPlatform, src_name::AbstractString;
     # GNU_LIBC_VERSION` would return, if it worked.
     if libc(platform) === "glibc"
         # This should be kept in sync with the version of glibc used in
-        # https://github.com/JuliaPackaging/Yggdrasil/blob/master/0_RootFS/gcc_common.jl
-        if arch(platform) in ("x86_64", "i686")
-            mapping["GNU_LIBC_VERSION"] = "glibc 2.12.2"
-        elseif arch(platform) in ("armv7l", "aarch64")
+        # https://github.com/JuliaPackaging/Yggdrasil/blob/master/0_RootFS/gcc_sources.jl
+        if arch(platform) in ("armv7l", "aarch64")
             mapping["GNU_LIBC_VERSION"] = "glibc 2.19"
-        elseif arch(platform) in ("powerpc64le", "riscv64")
+        elseif arch(platform) in ("x86_64", "i686",  "powerpc64le", "riscv64")
             mapping["GNU_LIBC_VERSION"] = "glibc 2.17"
         end
     end

src/Runner.jl

@@ -25,6 +25,10 @@ using BinaryBuilderBase
         Platform("x86_64",  "macos"; libgfortran_version=v"5"),
         Platform("aarch64", "macos"; libgfortran_version=v"5"),
     ]
+    @test expand_gfortran_versions(Platform("aarch64", "freebsd")) == [
+        Platform("aarch64", "freebsd"; libgfortran_version=v"4"),
+        Platform("aarch64", "freebsd"; libgfortran_version=v"5"),
+    ]
     @test expand_gfortran_versions([Platform("x86_64", "linux"; sanitize="memory")]) ==
         [Platform("x86_64", "linux"; sanitize="memory")]
     @test expand_gfortran_versions(Platform[]) isa Vector{Platform}
@@ -150,6 +154,9 @@ end
         # With LLVM 12 we can only use GCC 6+
         @test gcc_version(Platform("x86_64", "freebsd"), available_gcc_builds; llvm_version=v"12") ==
             filter(≥(v"6"), getversion.(available_gcc_builds))
+        # We can only use GCC 7+ on AArch64
+        @test gcc_version(Platform("aarch64", "freebsd"), available_gcc_builds) ==
+            filter(≥(v"7"), getversion.(available_gcc_builds))
 
         # libgfortran v3 and libstdcxx 22 restrict us to only v4.8, v5.2 and v6.1
         p = Platform("x86_64", "linux"; libgfortran_version=v"3", libstdcxx_version=v"3.4.22")

test/rootfs.jl

@@ -418,8 +418,8 @@ end
             @test !run(ur, cmd, iobuff; tee_stream=devnull)
             seekstart(iobuff)
             lines = readlines(iobuff)
-            @test lines[2] == "BinaryBuilder: You used one or more of the unsafe flags: -Ofast, -ffast-math, -funsafe-math-optimizations"
-            @test lines[3] == "Please repent."
+            @test lines[2] == "BinaryBuilder error: You used one or more of the unsafe flags: -Ofast, -ffast-math, -funsafe-math-optimizations"
+            @test lines[3] == "This is not allowed, please remove all unsafe flags from your build script to continue."
 
             ur = preferred_runner()(dir; platform=platform, allow_unsafe_flags=true)
             iobuff = IOBuffer()
@@ -545,10 +545,7 @@ end
             set -e
             make -j${nproc} -sC /usr/share/testsuite install
             """
-            # This test fails on GitHub Actions with non-squashfs on UserNS runners:
-            # <https://github.com/JuliaPackaging/BinaryBuilderBase.jl/issues/347>.
-            is_broken = get(ENV, "GITHUB_ACTIONS", "false")=="true" && !(BinaryBuilderBase.use_squashfs[]) && BinaryBuilderBase.preferred_runner() == BinaryBuilderBase.UserNSRunner
-            @test run(ur, `/bin/bash -c "$(test_script)"`, iobuff) broken=is_broken
+            @test run(ur, `/bin/bash -c "$(test_script)"`, iobuff)
         end
     end
 end