sage.sh: don't force the system arb

[bash.d.git] / sage.sh

diff --git a/sage.sh b/sage.sh
index 57db823f6a8cef5ba6c03ad30b281ad42deca862..6772336fb65eaa568db59805be73149c7a7ef885 100644 (file)
--- 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 \
@@ -40,10 +45,8 @@ sage-configure() {
     --disable-doc \
     --disable-notebook \
     --disable-r \
-    --with-system-arb=force \
     --with-system-asttokens=force \
     --with-system-attrs=force \
-    --with-system-backcall=force \
     --with-system-beniget=force \
     --with-system-boost_cropped=force \
     --with-system-brial=force \
@@ -55,6 +58,7 @@ sage-configure() {
     --with-system-cliquer=force \
     --with-system-cmake=force \
     --with-system-contourpy=force \
+    --with-system-conway_polynomials=force \
     --with-system-cppy=force \
     --with-system-curl=force \
     --with-system-cycler=force \