sage.sh: force primesieve/primecount from the system.

[bash.d.git] / sage.sh

diff --git a/sage.sh b/sage.sh
index 33d7f5aba101309d8260c81627403955cd891336..c167d51f4516bacc99c2c65ca56714644b4eccc8 100644 (file)
--- a/sage.sh
+++ b/sage.sh
@@ -17,14 +17,12 @@ export SAGE_DEBUG=no
 #   * --with-system-foo=force: ensure that the system packages I have
 #                              installed are actually used.
 #
-# TODO: --with-system-gengetopt=force
-#       --with-system-lcalc=force
-#
 sage-configure() {
   ./configure \
     --enable-download-from-upstream-url \
     --disable-r \
     --disable-cvxopt \
+    --disable-notebook \
     --with-system-arb=force \
     --with-system-boost_cropped=force \
     --with-system-brial=force \
@@ -32,6 +30,7 @@ sage-configure() {
     --with-system-cddlib=force \
     --with-system-cliquer=force \
     --with-system-cmake=force \
+    --with-system-curl=force \
     --with-system-ecl=force \
     --with-system-eclib=force \
     --with-system-fflas_ffpack=force \
@@ -39,6 +38,7 @@ sage-configure() {
     --with-system-fplll=force \
     --with-system-gc=force \
     --with-system-gcc=force \
+    --with-system-gengetopt=force \
     --with-system-gf2x=force \
     --with-system-gfan=force \
     --with-system-gfortran=force \
@@ -49,6 +49,7 @@ sage-configure() {
     --with-system-iconv=force \
     --with-system-iml=force \
     --with-system-isl=force \
+    --with-system-lcalc=force \
     --with-system-libatomic_ops=force \
     --with-system-libbraiding=force \
     --with-system-libffi=force \
@@ -70,17 +71,21 @@ sage-configure() {
     --with-system-perl_term_readline_gnu=force \
     --with-system-planarity=force \
     --with-system-ppl=force \
+    --with-system-primecount=force \
+    --with-system-primesieve=force \
     --with-system-python3=force \
+    --with-system-qhull=force \
     --with-system-readline=force \
     --with-system-rw=force \
+    --with-system-singular=force \
     --with-system-sqlite=force \
     --with-system-suitesparse=force \
     --with-system-symmetrica=force \
     --with-system-sympow=force \
     --with-system-tachyon=force \
     --with-system-tox=force \
-    --with-system-yasm=force \
     --with-system-xz=force \
     --with-system-zeromq=force \
-    --with-system-zlib=force
+    --with-system-zlib=force \
+    "${@}"
 }