X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=sage.sh;h=a3ec54da4da68d672cf2fb2743a2e4856b247706;hb=6865b47d1b3a9a532e3ac999a8b8e8ee0c9d6019;hp=c5cb345636ae68869d0fe76d14f5d1e8c150cbb8;hpb=b3071258592ccdd105914190e5f91645f2ed2932;p=bash.d.git

diff --git a/sage.sh b/sage.sh
index c5cb345..a3ec54d 100644
--- a/sage.sh
+++ b/sage.sh
@@ -8,13 +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}"
-}
-
 # Run ./configure within the SageMath git repository. This tweaks all
 # of the flags that I don't want to tweak manually:
 #
@@ -28,10 +21,7 @@ _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() {
-  ac_cv_path_NINJA=$(_sage_find_ninja) \
   ./configure \
     --enable-download-from-upstream-url \
     --enable-system-site-packages \
@@ -40,10 +30,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 +43,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 \
@@ -76,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 \
@@ -93,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 \
@@ -151,7 +142,9 @@ sage-configure() {
     --with-system-primecountpy=force \
     --with-system-primesieve=force \
     --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 \