sage.sh: support NINJA=samu

[bash.d.git] / sage.sh

diff --git a/sage.sh b/sage.sh
index 41e591a8d2392c913da46be645e4fefb43e2d615..e205b4e70b4b744c944ae979880bc4d973f16aa9 100644 (file)
--- a/sage.sh
+++ b/sage.sh
@@ -8,6 +8,13 @@ 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:
 #
@@ -21,7 +28,10 @@ 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() {
+  ac_cv_path_NINJA=$(_sage_find_ninja) \
   ./configure \
     --enable-download-from-upstream-url \
     --enable-system-site-packages \
@@ -48,7 +58,7 @@ sage-configure() {
     --with-system-cppy=force \
     --with-system-curl=force \
     --with-system-cycler=force \
-    --with-system-cypari2=force \
+    --with-system-cypari=force \
     --with-system-cysignals=force \
     --with-system-cython=force \
     --with-system-dateutil=force \
@@ -104,6 +114,7 @@ sage-configure() {
     --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 \
@@ -133,7 +144,9 @@ 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-pure_eval=force \
     --with-system-pybind11=force \