Skip to content

Commit d0073b2

Browse files
author
Release Manager
committed
gh-36391: checking that the system maxima has working help This is needed for e.g. building Sage docs, cf e.g. Sage's #36028. Some distos mix this up. Fixes #36028 URL: #36391 Reported by: Dima Pasechnik Reviewer(s): Matthias Köppe
2 parents 980a698 + ef67ba0 commit d0073b2

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

build/bin/write-dockerfile.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ EOF
104104
UPDATE="pacman -Sy &&"
105105
EXISTS="pacman -Si"
106106
INSTALL="pacman -Su --noconfirm"
107+
cat <<EOF
108+
RUN sed -i '/^NoExtract/d' /etc/pacman.conf
109+
EOF
107110
;;
108111
nix*)
109112
# https://hub.docker.com/r/nixos/nix

build/pkgs/maxima/spkg-configure.m4

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ SAGE_SPKG_CONFIGURE([maxima], [
2424
AS_IF([ecl --eval "(require 'maxima)" --eval "(quit)" \
2525
>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD], [
2626
AC_MSG_RESULT(yes)
27+
dnl check also for the Maxima help - needed by Sage
28+
AC_MSG_CHECKING([if maxima help is working])
29+
maxima_help_ok=`echo ? ? | ${SAGE_MAXIMA} 2>&1 | grep Details\:`
30+
AS_IF([test x$maxima_help_ok = x], [AC_MSG_RESULT(yes)], [
31+
AC_MSG_RESULT(no)
32+
sage_spkg_install_maxima=yes
33+
])
2734
], [
2835
AC_MSG_RESULT(no)
2936
sage_spkg_install_maxima=yes

0 commit comments

Comments
 (0)