From eec3e52e4764bdf9cbed2ca29cc01ada2774421a Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 2 Dec 2023 07:47:29 -0500 Subject: [PATCH] sage.sh: export the ninja cache variable Without this, the variable won't be set when sage reconfigures itself. I've also learned that polymake does not support Samurai, preventing me from fixing this properly within Sage itself. --- sage.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sage.sh b/sage.sh index 57db823..7ebc702 100644 --- a/sage.sh +++ b/sage.sh @@ -15,6 +15,12 @@ _sage_find_ninja(){ command -v "${NINJA}" } +# We have to export this because sage likes to re-bootstrap and +# re-configure itself every time you change a comment in an m4 file, +# and it won't re-configure with this variable set. So then after +# five minutes you'll get an error from --with-system-ninja=force. +export ac_cv_path_NINJA=$(_sage_find_ninja) + # Run ./configure within the SageMath git repository. This tweaks all # of the flags that I don't want to tweak manually: # @@ -31,7 +37,6 @@ _sage_find_ninja(){ # We also override the autoconf variable used to detect ninja, because # it does a version check that isn't compatible with samurai. sage-configure() { - ac_cv_path_NINJA=$(_sage_find_ninja) \ ./configure \ --enable-download-from-upstream-url \ --enable-system-site-packages \ -- 2.43.2