X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=sage.sh;h=b93f8951434fc6f9888ac92c68155e4666bba531;hb=18a2c71e7353821b0e96cb72d6cac12393b7ee1b;hp=5c412cb0812311591f682be93e552e52e6e1750f;hpb=9b14b34f215b132af8cd1db10a5966ab09884472;p=bash.d.git

diff --git a/sage.sh b/sage.sh
index 5c412cb..b93f895 100644
--- a/sage.sh
+++ b/sage.sh
@@ -8,6 +8,19 @@ 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:
 #
@@ -21,6 +34,8 @@ export SAGE_DEBUG=no
 #   * --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 \
@@ -45,9 +60,15 @@ 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 \
+    --with-system-cypari=force \
+    --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 \
@@ -60,6 +81,7 @@ sage-configure() {
     --with-system-flit_core=force \
     --with-system-fonttools=force \
     --with-system-fplll=force \
+    --with-system-fpylll=force \
     --with-system-gast=force \
     --with-system-gc=force \
     --with-system-gcc=force \
@@ -70,12 +92,15 @@ sage-configure() {
     --with-system-giac=force \
     --with-system-git=force \
     --with-system-givaro=force \
+    --with-system-gmpy2=force \
     --with-system-gsl=force \
     --with-system-hatchling=force \
     --with-system-iconv=force \
     --with-system-idna=force \
     --with-system-iml=force \
     --with-system-importlib_metadata=force \
+    --with-system-ipython=force \
+    --with-system-ipywidgets=force \
     --with-system-isl=force \
     --with-system-jedi=force \
     --with-system-jinja2=force \
@@ -90,13 +115,16 @@ sage-configure() {
     --with-system-libpng=force \
     --with-system-linbox=force \
     --with-system-lrcalc=force \
+    --with-system-lrcalc_python=force \
     --with-system-m4ri=force \
     --with-system-m4rie=force \
     --with-system-markupsafe=force \
     --with-system-matplotlib=force \
     --with-system-matplotlib_inline=force \
     --with-system-maxima=force \
+    --with-system-memory_allocator=force \
     --with-system-meson=force \
+    --with-system-meson_python=force \
     --with-system-mpfr=force \
     --with-system-mpmath=force \
     --with-system-nauty=force \
@@ -111,6 +139,7 @@ sage-configure() {
     --with-system-pari=force \
     --with-system-parso=force \
     --with-system-patch=force \
+    --with-system-patchelf=force \
     --with-system-pathspec=force \
     --with-system-perl_term_readline_gnu=force \
     --with-system-pexpect=force \
@@ -123,12 +152,17 @@ sage-configure() {
     --with-system-ply=force \
     --with-system-pluggy=force \
     --with-system-ppl=force \
+    --with-system-pplpy=force \
     --with-system-primecount=force \
+    --with-system-primecountpy=force \
     --with-system-primesieve=force \
+    --with-system-prompt_toolkit=force \
+    --with-system-ptyprocess=force \
     --with-system-pure_eval=force \
     --with-system-pybind11=force \
     --with-system-pygments=force \
     --with-system-pyparsing=force \
+    --with-system-pyproject_metadata=force \
     --with-system-python3=force \
     --with-system-pyrsistent=force \
     --with-system-pythran=force \
@@ -142,6 +176,7 @@ sage-configure() {
     --with-system-singular=force \
     --with-system-six=force \
     --with-system-sqlite=force \
+    --with-system-stack_data=force \
     --with-system-symmetrica=force \
     --with-system-sympow=force \
     --with-system-sympy=force \
@@ -150,6 +185,7 @@ sage-configure() {
     --with-system-tornado=force \
     --with-system-tox=force \
     --with-system-traitlets=force \
+    --with-system-typing_extensions=force \
     --with-system-urllib3=force \
     --with-system-wcwidth=force \
     --with-system-wheel=force \