Skip to content

Commit

Permalink
[qwtw] More modern dependencies (#8404)
Browse files Browse the repository at this point in the history
* [qwtw] More modern dependencies

* Update build_tarballs.jl

#include <fstream> added in a few places; one concern is looks like QT_NO_SSL is defined; not sure how Marble maps will work.

---------

Co-authored-by: Igor <[email protected]>
  • Loading branch information
giordano and ig-or authored Apr 2, 2024
1 parent 782ba36 commit dbb9918
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Q/qwtw/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ version = v"2.13.1"

# Collection of sources required to complete build
sources = [
GitSource("https://github.com/ig-or/qwtw.git", "0c3f17237574a29a174ea7dfd26c3c27b4a258bb")
GitSource("https://github.com/ig-or/qwtw.git", "06577ea7fabad4c51f4b2c2ee08e6696029f3011")
]

# Bash recipe for building across all platforms
script = raw"""
apk add g++
cd $WORKSPACE/srcdir
cd qwtw
cd $WORKSPACE/srcdir/qwtw
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release ../.
Expand All @@ -40,16 +39,17 @@ products = [
# Dependencies that must be installed before this package can be built
dependencies = [
Dependency(PackageSpec(name="Libglvnd_jll", uuid="7e76a0d4-f3c7-5321-8279-8d96eeed0f29"))
Dependency(PackageSpec(name="boost_jll", uuid="28df3c45-c428-5900-9ff8-a3135698ca75"); compat="=1.71.0")
Dependency(PackageSpec(name="boost_jll", uuid="28df3c45-c428-5900-9ff8-a3135698ca75"); compat="=1.79.0")
Dependency(PackageSpec(name="Qt_jll", uuid="ede63266-ebff-546c-83e0-1c6fb6d0efc8"))
Dependency(PackageSpec(name="qwt_jll", uuid="ed0789fa-10db-50b3-94da-03266d70be0f"))
Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae"))
Dependency(PackageSpec(name="FreeType2_jll", uuid="d7e528f0-a631-5988-bf34-fe36492bcfd7"); compat="2.10.4")
Dependency(PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"); compat="1.1.10")
Dependency(PackageSpec(name="marble_jll", uuid="678d7417-9a84-558b-a975-2deb8d71bebc"))
Dependency(PackageSpec(name="OpenSSL_jll", uuid="458c3c95-2e84-50aa-8efc-19380b2a3a95"); compat="3.0.8")
Dependency(PackageSpec(name="marble_jll", uuid="678d7417-9a84-558b-a975-2deb8d71bebc"); compat="23.04.3")
Dependency(PackageSpec(name="MathGL_jll", uuid="6834ddeb-87f2-5bbb-bfa4-c37572f854d4"))
]


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

0 comments on commit dbb9918

Please sign in to comment.