Skip to content

Commit

Permalink
Let override code also override GAP_lib_jll (#976)
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin authored Mar 19, 2024
1 parent 25238e3 commit 1582477
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion etc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ For this to work, follow these instructions:

To give a concrete example you could invoke

julia --proj=override etc/setup_override_dir.jl GAPROOT /tmp/gap_jll_override
julia --proj=override etc/setup_override_dir.jl $GAPROOT /tmp/gap_jll_override

4. Use the `etc/run_with_override.jl` script with the exact same Julia executable
and the override environment we just prepared.
Expand Down
2 changes: 2 additions & 0 deletions etc/run_with_override.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ gapoverride = abspath(gapoverride)
@info "Install needed packages"
using Pkg
Pkg.add(["GAP_jll"])
Pkg.add(["GAP_lib_jll"])
Pkg.develop(path=dirname(dirname(@__FILE__)))
Pkg.instantiate()

Expand Down Expand Up @@ -40,6 +41,7 @@ tmpdepot = mktempdir(; cleanup=true)

# create override file for GAP_jll
add_jll_override(tmpdepot, "GAP", gapoverride)
add_jll_override(tmpdepot, "GAP_lib", gapoverride)

# prepend our temporary depot to the depot list...
withenv("JULIA_DEPOT_PATH"=>tmpdepot*":") do
Expand Down
3 changes: 2 additions & 1 deletion etc/setup_override_dir.jl
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ if debugmode
# compile GAP in debug mode (enables many additional assertions in the kernel)
# and disable optimizations, so that debugging the resulting binary with gdb or lldb
# gets easier
@info "Debug mode is enabled"
extraargs = ["CFLAGS=-g", "CXXFLAGS=-g", "--enable-debug"]
else
extraargs = []
Expand Down Expand Up @@ -115,7 +116,7 @@ run(`make -j$(Sys.CPU_THREADS)`)
@info "Installing GAP to $(prefix)"

# install GAP binaries, headers, libraries
run(`make install-bin install-headers install-libgap install-sysinfo`)
run(`make install-bin install-headers install-libgap install-sysinfo install-gaproot`)


# We deliberately do NOT install the GAP library, documentation, etc. because
Expand Down

0 comments on commit 1582477

Please sign in to comment.