Skip to content
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

Jump to bottom

Reject system gap 4.13 #38222

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Reject system gap 4.13 #38222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
654112c
build/pkgs/gap/spkg-configure.m4: Reject GAP 4.13.0 or newer
mkoeppe Jun 15, 2024
2faf15f
build/pkgs/gap/distros/conda.txt: Set upper bound <4.13
mkoeppe Jun 15, 2024
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
2 changes: 1 addition & 1 deletion build/pkgs/gap/distros/conda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
gap-defaults>=4.12.2
gap-defaults>=4.12.2,<4.13.0
24 changes: 14 additions & 10 deletions build/pkgs/gap/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,21 @@ SAGE_SPKG_CONFIGURE([gap], [
sage_spkg_install_gap=yes

m4_pushdef([GAP_MINVER],["4.12.2"])
m4_pushdef([GAP_LTVER],["4.13.0"])

SAGE_SPKG_DEPCHECK([ncurses readline zlib], [
AC_PATH_PROG(GAP, gap)
AS_IF([test -n "${GAP}"], [
AC_MSG_CHECKING([for gap version GAP_MINVER or newer])

# GAP will later add the "user" path to the list of root paths
# so long as we don't initialize GAP with -r in Sage. But we
# don't want to include it in the hard-coded list.
AC_MSG_CHECKING([for gap version >= GAP_MINVER, < GAP_LTVER])
dnl GAP will later add the "user" path to the list of root paths
dnl so long as we don't initialize GAP with -r in Sage. But we
dnl don't want to include it in the hard-coded list.
GAPRUN="${GAP} -r -q --bare --nointeract -c"
_cmd='Display(GAPInfo.KernelInfo.KERNEL_VERSION);'
GAP_VERSION=$( ${GAPRUN} "${_cmd}" 2>/dev/null )
AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [
AX_COMPARE_VERSION(["${GAP_VERSION}"], [ge], [GAP_MINVER], [dnl
AC_MSG_RESULT([yes])
AX_COMPARE_VERSION(["${GAP_VERSION}"], [lt], [GAP_LTVER], [dnl
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for gap root paths])
_cmd='Display(JoinStringsWithSeparator(GAPInfo.RootPaths,";"));'
Expand Down Expand Up @@ -66,18 +68,20 @@ SAGE_SPKG_CONFIGURE([gap], [
AC_LANG_POP
LIBS="${_old_libs}"
])
], [
# The gap command itself failed
], [dnl The gap command itself failed
AC_MSG_RESULT([no (package check command failed)])
])
])
],[
# Version too old
], [dnl Version too new
AC_MSG_RESULT([no])
])
], [dnl Version too old
AC_MSG_RESULT([no])
])
])
])

m4_popdef([GAP_LTVER])
m4_popdef([GAP_MINVER])
],[],[],[
# This is the post-check phase, where we make sage-conf
Expand Down
Loading