Skip to content
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.

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

Updated FreeBSD from 13.2 to 13.4 / 14.1 #10402

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions 0_RootFS/PlatformSupport/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# if Sys.isapple(platform)
# suffix = arch(platform) == "aarch64" ? "20" : "14"
# elseif Sys.isfreebsd(platform)
# suffix = "13.2"
# suffix = arch(platform) == "aarch64" ? "14.1" : "13.4"
# else
# suffix = ""
# end
Expand Down Expand Up @@ -56,11 +56,11 @@ sources = [
]

freebsd_base = if Sys.isfreebsd(compiler_target) && arch(compiler_target) == "aarch64"
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/13.2-RELEASE/base.txz",
"7d1b032a480647a73d6d7331139268a45e628c9f5ae52d22b110db65fdcb30ff")
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/14.1-RELEASE/base.txz",
"b25830252e0dce0161004a5b69a159cbbd92d5e92ae362b06158dbb3f2568d32")
else
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.2-RELEASE/base.txz",
"3a9250f7afd730bbe274691859756948b3c57a99bcda30d65d46ae30025906f0")
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.4-RELEASE/base.txz",
"8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c")
end

push!(sources, freebsd_base)
Expand Down
2 changes: 1 addition & 1 deletion 0_RootFS/gcc_common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# `--deploy` flag to the `build_tarballs.jl` script. You can either build &
# deploy the compilers one by one or run something like
#
# for p in i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu armv7l-linux-gnueabihf powerpc64le-linux-gnu riscv64-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl armv7l-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd13.2 aarch64-unknown-freebsd13.2 i686-w64-mingw32 x86_64-w64-mingw32; do julia build_tarballs.jl --debug --verbose --deploy "${p}"; done
# for p in i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu armv7l-linux-gnueabihf powerpc64le-linux-gnu riscv64-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl armv7l-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd13.4 aarch64-unknown-freebsd14.1 i686-w64-mingw32 x86_64-w64-mingw32; do julia build_tarballs.jl --debug --verbose --deploy "${p}"; done

include("./common.jl")
include("./gcc_sources.jl")
Expand Down
8 changes: 4 additions & 4 deletions 0_RootFS/gcc_sources.jl
Original file line number Diff line number Diff line change
Expand Up @@ -301,13 +301,13 @@ function gcc_sources(gcc_version::VersionNumber, compiler_target::Platform; kwar
elseif Sys.isfreebsd(compiler_target)
if arch(compiler_target) == "aarch64"
libc_sources = [
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/13.2-RELEASE/base.txz",
"7d1b032a480647a73d6d7331139268a45e628c9f5ae52d22b110db65fdcb30ff"),
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/arm64/14.1-RELEASE/base.txz",
"b25830252e0dce0161004a5b69a159cbbd92d5e92ae362b06158dbb3f2568d32"),
]
else
libc_sources = [
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.2-RELEASE/base.txz",
"3a9250f7afd730bbe274691859756948b3c57a99bcda30d65d46ae30025906f0"),
ArchiveSource("http://ftp-archive.freebsd.org/pub/FreeBSD-Archive/old-releases/amd64/13.4-RELEASE/base.txz",
"8e13b0a93daba349b8d28ad246d7beb327659b2ef4fe44d89f447392daec5a7c"),
]
end
elseif Sys.iswindows(compiler_target)
Expand Down
2 changes: 1 addition & 1 deletion RootFS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This document details some of the journey we have embarked upon to create a Linu
* glibc Linux: `i686-linux-gnu`, `x86_64-linux-gnu`, `aarch64-linux-gnu`, `armv7l-linux-gnueabihf`, `armv6l-linux-gnueabihf`, `powerpc64le-linux-gnu`, `riscv64-linux-gnu`
* musl Linux: `i686-linux-musl`, `x86_64-linux-musl`, `aarch64-linux-musl`, `armv7l-linux-musleabihf`, `armv6l-linux-musleabihf`
* MacOS: `x86_64-apple-darwin`, `aarch64-apple-darwin`
* FreeBSD: `x86_64-unknown-freebsd13.2`, `aarch64-unknown-freebsd13.2`
* FreeBSD: `x86_64-unknown-freebsd13.4`, `aarch64-unknown-freebsd14.1`
* Windows: `i686-w64-mingw32`, `x86_64-w64-mingw32`

These target platforms are compiled for by building a suite a cross-compilers (`gcc`, `gfortran`, `clang`, `binutils`, etc...) that run on `x86-64-linux-musl`, but target the specific platform. Unfortunately, it is not sufficient to simply build these compilers once per target, because of incompatibilities between the generated code and the user's system where this code may eventually be running.
Expand Down