Skip to content
Merged
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
2 changes: 1 addition & 1 deletion L/libjulia/build_tarballs.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include("common.jl")

jllversion=v"1.11.0"
jllversion=v"1.11.1"
for ver in julia_full_versions
build_julia(ARGS, ver; jllversion)
end

This file was deleted.

This file was deleted.

19 changes: 11 additions & 8 deletions L/libjulia/common.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ using BinaryBuilderBase: get_addable_spec

const YGGDRASIL_DIR = "../.."
include(joinpath(YGGDRASIL_DIR, "fancy_toys.jl"))
include(joinpath(YGGDRASIL_DIR, "platforms", "macos_sdks.jl"))

# list of supported Julia versions
julia_full_versions = [v"1.10.0", v"1.11.1", v"1.12.0", v"1.13.0-DEV", v"1.14.0-DEV"]
julia_full_versions = [v"1.10.0", v"1.11.1", v"1.12.0", v"1.13.0-beta2", v"1.14.0-DEV"]
libjulia_min_julia_version = Base.thispatch(minimum(julia_full_versions))
if ! @isdefined julia_versions
julia_versions = Base.thispatch.(julia_full_versions)
Expand Down Expand Up @@ -75,16 +76,12 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
v"1.10.0" => "a4136608265c5d9186ae4767e94ddc948b19b43f760aba3501a161290852054d",
v"1.11.1" => "895549f40b21dee66b6380e30811f40d2d938c2baba0750de69c9a183cccd756",
v"1.12.0" => "c4f84dd858c36fbad010ebc4a73700f0dbb8c0f573c0734b9f7ae3f8fed0bba8",
v"1.13.0-beta2" => "5885a021056a8c83ed90daa5452f810d6b0d205ff6ff19e1582381abfdc7a9b2",
)

if version == v"1.13.0-DEV"
if version == v"1.14.0-DEV"
sources = [
GitSource("https://github.com/JuliaLang/julia.git", "abd8457ca85370eefe3788cfa13a6233773ea16f"),
DirectorySource("./bundled"),
]
elseif version == v"1.14.0-DEV"
sources = [
GitSource("https://github.com/JuliaLang/julia.git", "b63991c5b0aaf83b40603503457baa1ef98e7b98"),
GitSource("https://github.com/JuliaLang/julia.git", "df1fb13dc371c059218cc48b402730489dbc4963"),
DirectorySource("./bundled"),
]
else
Expand Down Expand Up @@ -260,6 +257,9 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
# julia expects libuv-julia.a
override LIBUV=${prefix}/lib/libuv.a

# julia needs the static version of utf8proc
override LIBUTF8PROC=${prefix}/lib/libutf8proc.a
Comment on lines +260 to +261
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Many thanks to @benlorenz for figuring out this fix (he is sitting next to me right now, so we communicated verbally ;-))


override BB_TRIPLET_LIBGFORTRAN_CXXABI=${BB_TRIPLET_LIBGFORTRAN_CXXABI}
override USE_BINARYBUILDER=1

Expand Down Expand Up @@ -415,6 +415,9 @@ function build_julia(ARGS, version::VersionNumber; jllversion=version)
# gcc 7 and gcc 8 crash on aarch64-linux when encountering some bfloat16 intrinsics
gcc_ver = version >= v"1.11.0-" ? v"9" : v"7"

# Julia requires macOS SDK >= 10.14
sources, script = require_macos_sdk("10.14", sources, script)

if any(should_build_platform.(triplet.(platforms)))
build_tarballs(ARGS, name, jllversion, sources, script, platforms, products, dependencies;
preferred_gcc_version=gcc_ver, preferred_llvm_version=v"17",
Expand Down