diff --git a/L/libsingular_julia/build_tarballs.jl b/L/libsingular_julia/build_tarballs.jl index eed4a47b70d..1e14c7f04cc 100644 --- a/L/libsingular_julia/build_tarballs.jl +++ b/L/libsingular_julia/build_tarballs.jl @@ -9,7 +9,7 @@ uuid = Base.UUID("a83860b7-747b-57cf-bf1f-3e79990d037f") delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid) name = "libsingular_julia" -version = v"0.32.1" +version = v"0.33.0" # reminder: change the above version if restricting the supported julia versions julia_versions = [v"1.6.3", v"1.7", v"1.8", v"1.9", v"1.10"] @@ -17,12 +17,12 @@ julia_compat = join("~" .* string.(getfield.(julia_versions, :major)) .* "." .* # Collection of sources required to build libsingular-julia sources = [ - GitSource("https://github.com/oscar-system/libsingular-julia.git", "eff1f172c070325887361c63b85b614de7e6b675"), + GitSource("https://github.com/oscar-system/Singular.jl.git", "14fdb93f83a7bc5a1ba396b85cf1a4fa9eff49d4"), ] # Bash recipe for building across all platforms script = raw""" -cd libsingular-julia +cd Singular.jl/deps/src cmake . -B build \ -DJulia_PREFIX="$prefix" \ -DSingular_PREFIX="$prefix" \ @@ -32,8 +32,14 @@ cmake . -B build \ -DCMAKE_CXX_STANDARD=14 \ -DCMAKE_BUILD_TYPE=Release +# TODO: update build instructions + VERBOSE=ON cmake --build build --config Release --target install -- -j${nproc} +# TODO: decide where to store tree hash +mkdir -p ${prefix}/share/libsingular_julia +git ls-tree --object-only HEAD deps/src > ${prefix}/share/libsingular_julia/src.treehash + install_license LICENSE.md """ @@ -55,7 +61,7 @@ dependencies = [ BuildDependency("GMP_jll"), BuildDependency("MPFR_jll"), Dependency("libcxxwrap_julia_jll"), - Dependency("Singular_jll", compat = "~403.202.200"), + Dependency("Singular_jll", compat = "~403.203.200"), ] # Build the tarballs, and possibly a `build.jl` as well.