Skip to content

Commit ecfa2f2

Browse files
t-bltgmbaz
andauthored
[Gaston] add --with-bitmap-terminals (#11608)
* add `--with-bitmap-terminals` Co-authored-by: mbaz <[email protected]> * update * up * fixes --------- Co-authored-by: mbaz <[email protected]>
1 parent 7fb87ce commit ecfa2f2

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

G/Gnuplot/build_tarballs.jl

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
using BinaryBuilder, Pkg
22

3+
function yggdrasil_version(version::VersionNumber, offset::VersionNumber)
4+
max_offset = v"10.100.1000"
5+
@assert offset < max_offset
6+
VersionNumber(
7+
max_offset.major * version.major + offset.major,
8+
max_offset.minor * version.minor + offset.minor,
9+
max_offset.patch * version.patch + offset.patch
10+
)
11+
end
12+
313
name = "Gnuplot"
414
version = v"6.0.3"
5-
build_number_jll = 1 # NOTE: increment on rebuild of the same version, reset on new gnuplot version
6-
version_jll = VersionNumber(version.major, version.minor, 1_000 * version.patch + build_number_jll)
15+
ygg_offset = v"0.0.2" # NOTE: increase on new build, reset on new upstream version
16+
ygg_version = yggdrasil_version(version, ygg_offset)
717

818
# Collection of sources required to complete build
919
sources = [
@@ -33,6 +43,7 @@ if [[ ${target} == aarch64-apple-* ]]; then # FIXES the undefined symbol: __div
3343
fi
3444
3545
unset args
46+
args+=(--with-bitmap-terminals)
3647
args+=(--disable-wxwidgets)
3748
3849
# FIXME: no Qt Tools artifacts available for these platforms (missing either uic or lrelease)
@@ -47,9 +58,11 @@ make -C src -j${nproc}
4758
make -C src install
4859
""" * """
4960
# add a fake `gnuplot_fake` executable, in order to determine `GNUPLOT_DRIVER_DIR` in `Gaston.jl`
50-
mkdir -p \$prefix/$libexec_path
51-
touch \$prefix/$libexec_path/gnuplot_fake\$exeext
52-
chmod +x \$prefix/$libexec_path/gnuplot_fake\$exeext
61+
dn="\$prefix/$libexec_path"
62+
""" * raw"""
63+
mkdir -p $dn
64+
touch $dn/gnuplot_fake$exeext
65+
chmod +x $dn/gnuplot_fake$exeext
5366
"""
5467

5568
# These are the platforms we will build for by default, unless further
@@ -86,6 +99,6 @@ dependencies = [
8699

87100
# Build the tarballs, and possibly a `build.jl` as well.
88101
build_tarballs(
89-
ARGS, name, version_jll, sources, script, platforms, products, dependencies;
102+
ARGS, name, ygg_version, sources, script, platforms, products, dependencies;
90103
julia_compat="1.6", preferred_gcc_version = v"8"
91104
)

0 commit comments

Comments
 (0)