Skip to content

Commit de21f03

Browse files
committed
build script update
1 parent 6d4181c commit de21f03

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

.ci/build_tarballs.jl

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,27 @@ using BinaryBuilder
44
using Pkg
55

66
name = "FastJet_Julia_Wrapper"
7-
version = v"0.7.2"
7+
version = v"0.8.0-alpha4"
88

99
# Collection of sources required to build Fjwbuilder
1010
sources = [
1111
DirectorySource("FastJet_Julia_Wrapper"),
12-
ArchiveSource("https://julialang-s3.julialang.org/bin/linux/x64/1.3/julia-1.3.1-linux-x86_64.tar.gz", "faa707c8343780a6fe5eaf13490355e8190acf8e2c189b9e7ecbddb0fa2643ad"; unpack_target="julia-x86_64-linux-gnu"),
1312
]
1413

1514
# Bash recipe for building across all platforms
1615
script = raw"""
17-
case "$target" in
18-
arm-linux-gnueabihf|x86_64-linux-gnu)
19-
Julia_PREFIX=${WORKSPACE}/srcdir/julia-$target/julia-1.3.1
20-
;;
21-
x86_64-apple-darwin14|x86_64-w64-mingw32)
22-
Julia_PREFIX=${WORKSPACE}/srcdir/julia-$target/juliabin
23-
;;
24-
esac
2516
cd ${WORKSPACE}/srcdir
2617
mkdir build && cd build
27-
cmake -DJulia_PREFIX=${Julia_PREFIX} -DCMAKE_INSTALL_PREFIX=${prefix} -DCMAKE_FIND_ROOT_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release ..
18+
cmake -DJulia_PREFIX=${prefix} -DCMAKE_INSTALL_PREFIX=${prefix} -DCMAKE_FIND_ROOT_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release ..
2819
VERBOSE=ON cmake --build . --config Release --target install
2920
install_license $WORKSPACE/srcdir/LICENSE.md
3021
"""
3122

3223
# These are the platforms we will build for by default, unless further
3324
# platforms are passed in on the command line
3425
platforms = Platform[
35-
Linux(:x86_64, libc=:glibc)
26+
Linux(:x86_64; libc=:glibc, compiler_abi=CompilerABI(cxxstring_abi=:cxx11))
3627
]
37-
platforms = expand_cxxstring_abis(platforms)
3828

3929
# The products that we will ensure are always built
4030
products = [
@@ -43,10 +33,10 @@ products = [
4333

4434
# Dependencies that must be installed before this package can be built
4535
dependencies = [
46-
Dependency("libcxxwrap_julia_jll"),
47-
Dependency("FastJet_jll")
48-
# Dependency(PackageSpec(;name="FastJet_jll", url="https://github.com/jstrube/FastJet_jll.jl"))
36+
Dependency(PackageSpec(name="libcxxwrap_julia_jll", version=v"0.8")),
37+
Dependency("FastJet_jll"),
38+
BuildDependency(PackageSpec(name="Julia_jll", version=v"1.4.1"))
4939
]
5040

5141
# Build the tarballs, and possibly a `build.jl` as well.
52-
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"9")
42+
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version=v"7")

0 commit comments

Comments
 (0)