Skip to content

[GAP] Update to 4.15.0 #11987

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.

Sign up for GitHub

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

Merged
fingolfin merged 7 commits into from
Sep 29, 2025
Merged

[GAP] Update to 4.15.0 #11987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c8e258e
[GAP] Update to 4.15.0-beta1
lgoettgens Sep 1, 2025
6aa87ad
Update patches
lgoettgens Sep 1, 2025
a939c41
[GAP] Update to v4.15.0-beta2
lgoettgens Sep 19, 2025
03006f3
[GAP] Update to v4.15.0-beta3
lgoettgens Sep 24, 2025
f7620a7
Merge branch 'master' into lg/GAP
lgoettgens Sep 24, 2025
cecf397
Update used libjulia
lgoettgens Sep 24, 2025
f4a5a3d
[GAP] Update to v4.15.0
lgoettgens Sep 29, 2025
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
8 changes: 4 additions & 4 deletions G/GAP/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ uuid = Base.UUID("a83860b7-747b-57cf-bf1f-3e79990d037f")
delete!(Pkg.Types.get_last_stdlibs(v"1.6.3"), uuid)

name = "GAP"
upstream_version = v"4.14.0"
version = v"400.1401.005"
upstream_version = v"4.15.0"
version = v"400.1500.000"

# Collection of sources required to complete build
sources = [
ArchiveSource("https://github.com/gap-system/gap/releases/download/v$(upstream_version)/gap-$(upstream_version)-core.tar.gz",
"81ecfc6f6df044739ba34ec306cc25e847967d94f1c645b093cc21749ccc1e49"),
"5f299fe8ae092a0ed85033f348b1df031cf0e2fb4fb9184c21e92210303c125c"),
DirectorySource("./bundled"),
]

Expand Down Expand Up @@ -129,7 +129,7 @@ dependencies = [
Dependency("GMP_jll"),
Dependency("Readline_jll"; compat="8.2.13"),
Dependency("Zlib_jll"),
BuildDependency(PackageSpec(;name="libjulia_jll", version=v"1.10.19")),
BuildDependency(PackageSpec(;name="libjulia_jll", version=v"1.10.20")),
]

# Build the tarballs.
Expand Down
11 changes: 5 additions & 6 deletions G/GAP/bundled/patches/julia_gc-rescan.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From cfc9fe38fed4c09f37e5771265415f464592fbe2 Mon Sep 17 00:00:00 2001
From 2e70eb8b14dfe314090e0cdfcb2d8ec5c0f5aaaa Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Tue, 3 Sep 2024 23:12:40 +0200
Date: Mon, 1 Sep 2025 14:59:56 +0200
Subject: [PATCH] kernel: disable task stack rescan optimization

This seems to prevent recent crashes in GAP.jl. It is not a viable
Expand All @@ -12,10 +12,10 @@ fixes all the crashes.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/julia_gc.c b/src/julia_gc.c
index d44c69fc5..a3d3ee0fe 100644
index 568b567b1..cd57329af 100644
--- a/src/julia_gc.c
+++ b/src/julia_gc.c
@@ -621,7 +621,7 @@ static void GapTaskScanner(jl_task_t * task, int root_task)
@@ -605,7 +605,7 @@ static void GapTaskScanner(jl_task_t * task, int root_task)
// age bit back to new if tasks are being switched.
jl_taggedvalue_t * tag = jl_astaggedvalue(task);
if (tag->bits.gc & 2)
Expand All @@ -25,5 +25,4 @@ index d44c69fc5..a3d3ee0fe 100644

char *active_start, *active_end, *total_start, *total_end;
--
2.46.0

2.50.1
13 changes: 6 additions & 7 deletions G/GAP/bundled/patches/sysinfo.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
From 64f0c59db8da6f9cf245c4ccfcc6c33f728ac67e Mon Sep 17 00:00:00 2001
From 7a92caaa6d83a1a9227c8de749404d22a1a2c102 Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Mon, 9 Dec 2024 22:14:26 +0100
Date: Mon, 1 Sep 2025 15:04:15 +0200
Subject: [PATCH] gac: use -lgap when bulding kernel extensions

---
Makefile.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.rules b/Makefile.rules
index 3da46a54f..88567c798 100644
index 1213125bb..c031e3f6e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -670,7 +670,7 @@ install-gaproot: CITATION
@@ -671,7 +671,7 @@ install-gaproot: install-dirs CITATION

# the following lines adjust variables for the installed sysinfo.gap
install-sysinfo: SYSINFO_CPPFLAGS = -I${includedir}/gap -I${includedir} $(GAP_DEFINES)
install-sysinfo: SYSINFO_CPPFLAGS = -I${includedir}/gap/extra $(GAP_DEFINES)
-install-sysinfo: SYSINFO_LDFLAGS = $(ABI_CFLAGS)
+install-sysinfo: SYSINFO_LDFLAGS = $(ABI_CFLAGS) -L$(libdir) -lgap

@lgoettgens lgoettgens Sep 1, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@fingolfin Is this patch something that could be upstreamed to gap? Or is this specific to the way GAP.jl compiles kernel extensions?

@fingolfin fingolfin Sep 3, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

For now this is GAP.jl specific. Upstreaming this cleanly is a bit hairy, see gap-system/gap#5780

install-sysinfo: SYSINFO_GAP = $(bindir)/gap
install-sysinfo: SYSINFO_GAC = $(bindir)/gac
install-sysinfo: GMP_PREFIX =
--
2.47.0

2.50.1