Skip to content

[Geant4_julia] Use latest Geant4_jll 11.3 #11098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions G/Geant4_julia/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ uuid = Base.UUID("a83860b7-747b-57cf-bf1f-3e79990d037f")
delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid)

name = "Geant4_julia"
version = v"0.2.1"
version = v"0.2.2"

# Collection of sources required to build Geant4_julia
sources = [
GitSource("https://github.com/peremato/Geant4_cxxwrap.git",
"9105e15ead1749d4b111f10f8ae1110036b8bdb9"),
"b82c50a861c5957b2b2d83d4d7674b40ba829209"),
]

# Bash recipe for building across all platforms
Expand All @@ -24,7 +24,8 @@ cmake ${WORKSPACE}/srcdir/Geant4_cxxwrap -B build \
-DCMAKE_INSTALL_PREFIX=${prefix} \
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17
-DCMAKE_CXX_STANDARD=17 \
-DZLIB_ROOT="${prefix}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look like this option is being used or effective. One option is to delete the tbd file in the sysroot, but I think this is a cmake issue.


VERBOSE=ON cmake --build build --config Release --target install -- -j${nproc}

Expand Down Expand Up @@ -56,14 +57,12 @@ products = [
# Dependencies that must be installed before this package can be built
dependencies = [
BuildDependency("libjulia_jll"),
BuildDependency("Xorg_xorgproto_jll"),
Dependency("libcxxwrap_julia_jll"; compat="0.13.2"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may want to try version 0.14

Dependency("Geant4_jll"; compat = "~11.2.1"),
Dependency("Expat_jll"),
Dependency("Xerces_jll"),
Dependency("Geant4_jll"; compat="~11.3")
]

# 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",
julia_compat="1.6")