Skip to content

Commit

Permalink
XyceWrapper: support more julia versions (JuliaPackaging#4462)
Browse files Browse the repository at this point in the history
* XyceWrapper: support more julia versions

* XyceWrapper: set julia compat

* XyceWrapper: 1.6 -> 1.6.3

* XyceWrapper: patch imported from jlqml

* XyceWrapper: filter platforms
  • Loading branch information
sjkelly authored and simeonschaub committed Feb 23, 2022
1 parent 5b922f7 commit 2f36a17
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions X/XyceWrapper/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# `julia build_tarballs.jl --help` to see a usage message.
using BinaryBuilder, Pkg

julia_version = v"1.6.0"
julia_versions = [v"1.6.3", v"1.7"]

name = "XyceWrapper"
version = v"0.2.0"
Expand All @@ -12,6 +12,11 @@ sources = [
DirectorySource("./src"),
]

# 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)

# Bash recipe for building across all platforms
script = raw"""
mkdir -p build
Expand All @@ -28,8 +33,10 @@ install_license /usr/share/licenses/MIT
"""

include("../../L/libjulia/common.jl")
platforms = libjulia_platforms(julia_version)
platforms = vcat(libjulia_platforms.(julia_versions)...)
platforms = expand_cxxstring_abis(platforms)
filter!(p -> arch(p) != "armv6l", platforms)
filter!(p -> !(arch(p) == "aarch64" && Sys.isapple(p)), platforms)

# The products that we will ensure are always built
products = [
Expand All @@ -40,8 +47,8 @@ products = [
dependencies = [
Dependency("Xyce_jll"; compat="^7.4.0"),
Dependency("libcxxwrap_julia_jll"),
BuildDependency(PackageSpec(name="libjulia_jll", version=julia_version)),
BuildDependency("libjulia_jll"),
]

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

0 comments on commit 2f36a17

Please sign in to comment.