X-Git-Url: http://gitweb.michael.orlitzky.com/?p=bash.d.git;a=blobdiff_plain;f=sage.sh;h=131eb84b15b384bf206bc0fc0983175a3fccedc2;hp=6772336fb65eaa568db59805be73149c7a7ef885;hb=HEAD;hpb=b373823c413c588cf57ca342e149a970e35b7a51

diff --git a/sage.sh b/sage.sh
index 6772336..65d7ec3 100644
--- a/sage.sh
+++ b/sage.sh
@@ -8,19 +8,6 @@ export SAGE_INSTALL_GCC=no
 # This is trinary, ha ha!
 export SAGE_DEBUG=no
 
-# Print the path to either ninja (default) or samurai (if set via
-# $NINJA).
-_sage_find_ninja(){
-  [ -z "${NINJA}" ] && NINJA=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:
 #
@@ -34,8 +21,6 @@ export ac_cv_path_NINJA=$(_sage_find_ninja)
 #   * --with-system-foo=force: ensure that the system packages I have
 #                              installed are actually used.
 #
-# We also override the autoconf variable used to detect ninja, because
-# it does a version check that isn't compatible with samurai.
 sage-configure() {
   ./configure \
     --enable-download-from-upstream-url \
@@ -51,6 +36,7 @@ sage-configure() {
     --with-system-boost_cropped=force \
     --with-system-brial=force \
     --with-system-bzip2=force \
+    --with-system-calver=force \
     --with-system-cddlib=force \
     --with-system-certifi=force \
     --with-system-cffi=force \
@@ -66,7 +52,6 @@ sage-configure() {
     --with-system-cysignals=force \
     --with-system-cython=force \
     --with-system-dateutil=force \
-    --with-system-debugpy=force \
     --with-system-decorator=force \
     --with-system-docutils=force \
     --with-system-ecl=force \
@@ -80,6 +65,7 @@ sage-configure() {
     --with-system-fonttools=force \
     --with-system-fplll=force \
     --with-system-fpylll=force \
+    --with-system-gap=force \
     --with-system-gast=force \
     --with-system-gc=force \
     --with-system-gcc=force \
@@ -97,6 +83,7 @@ sage-configure() {
     --with-system-idna=force \
     --with-system-iml=force \
     --with-system-importlib_metadata=force \
+    --with-system-ipykernel=force \
     --with-system-ipython=force \
     --with-system-ipywidgets=force \
     --with-system-isl=force \
@@ -134,6 +121,7 @@ sage-configure() {
     --with-system-numpy=force \
     --with-system-openblas=force \
     --with-system-packaging=force \
+    --with-system-palp=force \
     --with-system-pari=force \
     --with-system-parso=force \
     --with-system-patch=force \
@@ -157,9 +145,11 @@ sage-configure() {
     --with-system-prompt_toolkit=force \
     --with-system-ptyprocess=force \
     --with-system-pure_eval=force \
+    --with-system-py=force \
     --with-system-pybind11=force \
     --with-system-pygments=force \
     --with-system-pyparsing=force \
+    --with-system-pyproject_api=force \
     --with-system-pyproject_metadata=force \
     --with-system-python3=force \
     --with-system-pyrsistent=force \