From 6582b12aafa2a210924c2c03767f849b803d4a72 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 19 Jan 2022 16:30:23 +0100 Subject: [PATCH 1/3] [libsingular_julia] update to v0.21 --- L/libsingular_julia/build_tarballs.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/L/libsingular_julia/build_tarballs.jl b/L/libsingular_julia/build_tarballs.jl index af9d99bef18..36c557e0e32 100644 --- a/L/libsingular_julia/build_tarballs.jl +++ b/L/libsingular_julia/build_tarballs.jl @@ -4,13 +4,13 @@ using BinaryBuilder, Pkg using Base.BinaryPlatforms name = "libsingular_julia" -version = v"0.20.00" +version = v"0.21.00" julia_versions = [v"1.6.0", v"1.7.0", v"1.8.0"] # Collection of sources required to build libsingular-julia sources = [ - GitSource("https://github.com/oscar-system/libsingular-julia.git", "dc655e75960c9f5fb1b6e838197dddb8b8c7501b"), + GitSource("https://github.com/oscar-system/libsingular-julia.git", "93cae044e9ca6cce2bf444147ccc07913baea82f"), ] # Bash recipe for building across all platforms @@ -48,7 +48,7 @@ dependencies = [ BuildDependency("GMP_jll"), BuildDependency("MPFR_jll"), Dependency("libcxxwrap_julia_jll"), - Dependency("Singular_jll", compat = "~402.101.200"), + Dependency("Singular_jll", compat = "~403.0.100"), ] # Build the tarballs, and possibly a `build.jl` as well. From 01a4eafa5c9a67e542848f105d60d13050029dc2 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 20 Jan 2022 17:52:52 +0100 Subject: [PATCH 2/3] Update build_tarballs.jl --- L/libsingular_julia/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/libsingular_julia/build_tarballs.jl b/L/libsingular_julia/build_tarballs.jl index 36c557e0e32..52da07387b9 100644 --- a/L/libsingular_julia/build_tarballs.jl +++ b/L/libsingular_julia/build_tarballs.jl @@ -4,7 +4,7 @@ using BinaryBuilder, Pkg using Base.BinaryPlatforms name = "libsingular_julia" -version = v"0.21.00" +version = v"0.21.0" julia_versions = [v"1.6.0", v"1.7.0", v"1.8.0"] From 04d99894e8597baa92c24f38db99c649df8164ff Mon Sep 17 00:00:00 2001 From: dan Date: Mon, 31 Jan 2022 13:47:48 +0100 Subject: [PATCH 3/3] add some workarounds --- L/libsingular_julia/build_tarballs.jl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/L/libsingular_julia/build_tarballs.jl b/L/libsingular_julia/build_tarballs.jl index 52da07387b9..9a123a29e30 100644 --- a/L/libsingular_julia/build_tarballs.jl +++ b/L/libsingular_julia/build_tarballs.jl @@ -3,14 +3,18 @@ using BinaryBuilder, Pkg using Base.BinaryPlatforms +# See https://github.com/JuliaLang/Pkg.jl/issues/2942 +# Once this Pkg issue is resolved, this must be removed +uuid = Base.UUID("a83860b7-747b-57cf-bf1f-3e79990d037f") +delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid) + +julia_versions = [v"1.6.3", v"1.7.0", v"1.8.0"] name = "libsingular_julia" version = v"0.21.0" -julia_versions = [v"1.6.0", v"1.7.0", v"1.8.0"] - # Collection of sources required to build libsingular-julia sources = [ - GitSource("https://github.com/oscar-system/libsingular-julia.git", "93cae044e9ca6cce2bf444147ccc07913baea82f"), + GitSource("https://github.com/oscar-system/libsingular-julia.git", "c96232eaa85e582ec94e257a69548b486ab0eadc"), ] # Bash recipe for building across all platforms