From: Michael Orlitzky <michael@orlitzky.com>
Date: Fri, 15 Dec 2023 15:25:59 +0000 (-0500)
Subject: sage.sh: drop ninja/samurai hacks
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=c0395db617e2095f5bb2d0c2a75225e16fd5da6f;p=bash.d.git

sage.sh: drop ninja/samurai hacks

We now have app-alternatives/ninja in Gentoo to deal with this.
---

diff --git a/sage.sh b/sage.sh
index 6772336..b5df79f 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 \