From 87b33e0f09d42ef5670d63fa01dfc1f8e121ac7f Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 21 Oct 2020 02:31:08 +0200 Subject: [PATCH] libcxxwrap_julia: switch to libjulia Also drop the restriction to the cxx11 ABI and add more platforms. --- L/libcxxwrap_julia/build_tarballs.jl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/L/libcxxwrap_julia/build_tarballs.jl b/L/libcxxwrap_julia/build_tarballs.jl index 97296a1e78d..8fbfba830b3 100644 --- a/L/libcxxwrap_julia/build_tarballs.jl +++ b/L/libcxxwrap_julia/build_tarballs.jl @@ -25,16 +25,12 @@ install_license $WORKSPACE/srcdir/libcxxwrap-julia*/LICENSE.md # These are the platforms we will build for by default, unless further # platforms are passed in on the command line -platforms = [ - FreeBSD(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Linux(:armv7l; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Linux(:aarch64; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Linux(:x86_64; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Linux(:i686; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - MacOS(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Windows(:x86_64; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), - Windows(:i686; compiler_abi=CompilerABI(cxxstring_abi=:cxx11)), -] +platforms = supported_platforms() +# in Julia <= 1.4 skip all musl builds +filter!(p -> !(Sys.islinux(p) && libc(p) == "musl"), platforms) +# in Julia <= 1.4 skip 32bit ARM builds +filter!(p -> !(Sys.islinux(p) && arch(p) == "armv7l"), platforms) +platforms = expand_cxxstring_abis(platforms) # The products that we will ensure are always built products = [ @@ -44,7 +40,7 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - BuildDependency(PackageSpec(name="Julia_jll",version=v"1.4.1")) + BuildDependency(PackageSpec(name="libjulia_jll", version=v"1.4.2")) ] # Build the tarballs, and possibly a `build.jl` as well.