From fb1f971cbdc96fb0052dc8073050d495cf6db10f Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Fri, 9 Feb 2024 17:21:08 -0500 Subject: [PATCH] Update libuv to v2-1.48.0 (#8081) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [LibUV] Use GCC 5 for stdatomic.h * [LibUV] Use LLVMCompilerRT v13 * [LibUV] Match LLVM and LLVMCompilerRT versions Co-authored-by: Mosè Giordano --- L/LibUV/build_tarballs.jl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/L/LibUV/build_tarballs.jl b/L/LibUV/build_tarballs.jl index eb36075d0ac..d014c1b6dab 100644 --- a/L/LibUV/build_tarballs.jl +++ b/L/LibUV/build_tarballs.jl @@ -1,4 +1,6 @@ using BinaryBuilder +using Pkg +using BinaryBuilderBase: sanitize name = "LibUV" version = v"2" @@ -6,7 +8,7 @@ version = v"2" # Collection of sources required to build libuv sources = [ GitSource("https://github.com/JuliaLang/libuv.git", - "2723e256e952be0b015b3c0086f717c3d365d97e"), + "afa1c67fa496eb49ade1e520f76fd018a1409eaa"), ] # Bash recipe for building across all platforms @@ -39,13 +41,16 @@ products = [ LibraryProduct("libuv", :libuv), ] +llvm_version = v"13.0.1" + # Dependencies that must be installed before this package can be built dependencies = [ - BuildDependency("LLVMCompilerRT_jll"; platforms=[Platform("x86_64", "linux"; sanitize="memory")]), + BuildDependency(PackageSpec(; name="LLVMCompilerRT_jll", uuid="4e17d02c-6bf5-513e-be62-445f41c75a11", version=llvm_version); platforms=filter(p -> sanitize(p)=="memory", platforms)), ] # Note: we explicitly lie about this because we don't have the new # versioning APIs worked out in BB yet. version = v"2.0.1" -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6") - +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; + # We need GCC 4.9+ for stdatomic.h + julia_compat="1.6", preferred_gcc_version=v"5", preferred_llvm_version=llvm_version)