Skip to content

Commit

Permalink
Fix SDPA_jll for Julia v1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
blegat committed Apr 24, 2022
1 parent 0b50281 commit 5440dc6
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions S/SDPA/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg

julia_version = v"1.5.3"
# 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"]

# The version of this JLL is decoupled from the upstream version.
# Whenever we package a new upstream release, we initially map its
Expand All @@ -18,7 +23,7 @@ julia_version = v"1.5.3"
# map a prerelease of 2.7.0 to 200.690.000.

name = "SDPA"
version = v"700.300.800"
version = v"700.301.800"
upstream_version = v"7.3.8"

# Collection of sources required to build SDPABuilder
Expand Down Expand Up @@ -115,7 +120,7 @@ products = [
# These are the platforms we will build for by default, unless further
# platforms are passed in on the command line
include("../../L/libjulia/common.jl")
platforms = libjulia_platforms(julia_version)
platforms = reduce(vcat, libjulia_platforms.(julia_versions))
platforms = expand_cxxstring_abis(platforms)
platforms = expand_gfortran_versions(platforms)
filter!(p -> libgfortran_version(p) >= v"4", platforms)
Expand All @@ -125,12 +130,12 @@ dependencies = [
Dependency("libcxxwrap_julia_jll"),
Dependency("OpenBLAS32_jll"),
Dependency("CompilerSupportLibraries_jll"),
BuildDependency(PackageSpec(name="libjulia_jll", version=julia_version)),
BuildDependency("libjulia_jll"),
BuildDependency(MUMPS_seq_packagespec),
BuildDependency(METIS_packagespec),
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version=v"8",
julia_compat = "$(julia_version.major).$(julia_version.minor)")
preferred_gcc_version = v"8",
julia_compat = "1.6")

0 comments on commit 5440dc6

Please sign in to comment.