Merge branch 'develop' into t/9427/public/ticket/9427

* develop: (698 commits)
  Updated Sage version to 6.5.rc0
  trac #17671: fix two doctests
  #17685 better regex for sage ^-n=.*
  trac #17671: fix float definition of gcd/lcm/xgcd
  trac #17671: fix typo in doc
  trac #17671: force the parent of gcd/lcm/xgcd
  trac #17671: gcd(2.0, 6.0) is now 1.0
  trac #17671: fix doctest in coercion_and_categories.rst
  trac #17671: revert changes in function_field.py
  trac #17671: (review) clearer doc in rings.arith.xgcd
  trac #17671: fix xgcd of polynomial_field_generic
  trac #17671: (review) fix gcd/xgcd in QuotientFields
  trac #17671: fix doctests
  trac #17671: compatibility of gcd and xgcd
  Updated Sage version to 6.5.beta6
  Minor typesetting issue in graph.py
  trac #17683: Subgraph of Hasse Diagram gives error
  trac #17616: Broken doctest
  17675: reviewer's patch: fix typo
  trac #17675: doc typo
  ...

COPYING.txt

@@ -88,6 +88,7 @@ pari                        GPLv2+
 patch                       GPLv2+
 pexpect                     Python License
 pillow                      Apache License 2.0
+pip                         MIT License
 pkgconf                     ISC License (equivalent to Simplified BSD)
 pkgconfig                   MIT License
 polybori                    GPLv2+
@@ -116,7 +117,6 @@ setuptools                  Python License
 singular                    GPLv2 or GPLv3 (see below)
 six                         MIT License
 sphinx                      Modified BSD
-sqlalchemy                  MIT License
 sqlite                      Public Domain (see below)
 symmetrica                  MIT-like License (see below)
 sympow                      Modified BSD

VERSION.txt

@@ -1 +1 @@
-Sage version 6.5.beta2, released 2014-12-04
+Sage version 6.5.rc0, released 2015-01-29

build/deps

@@ -70,7 +70,6 @@ all-sage: \
      $(INST)/$(MPC) \
      $(INST)/$(MPFI) \
      $(INST)/$(MPFR) \
-     $(INST)/$(MPIR) \
      $(INST)/$(MPMATH) \
      $(INST)/$(NETWORKX) \
      $(INST)/$(NTL) \
@@ -79,6 +78,7 @@ all-sage: \
      $(INST)/$(PARI) \
      $(INST)/$(PEXPECT) \
      $(INST)/$(PILLOW) \
+     $(INST)/$(PIP) \
      $(INST)/$(PKGCONF) \
      $(INST)/$(PKGCONFIG) \
      $(INST)/$(POLYBORI) \
@@ -103,7 +103,6 @@ all-sage: \
      $(INST)/$(SINGULAR) \
      $(INST)/$(SIX) \
      $(INST)/$(SPHINX) \
-     $(INST)/$(SQLALCHEMY) \
      $(INST)/$(SQLITE) \
      $(INST)/$(SYMMETRICA) \
      $(INST)/$(SYMPOW) \
@@ -114,6 +113,7 @@ all-sage: \
      $(INST)/$(ZEROMQ) \
      $(INST)/$(ZLIB) \
      $(INST)/$(ZNPOLY) \
+     $(INST)/$(SAGE_MP_LIBRARY) \
      $(INST)/sage \
      $(INST)/csage \
      $(EXTCODE) \
@@ -131,7 +131,7 @@ toolchain: $(TOOLCHAIN)
 # See #14168 and #14232.
 toolchain-deps:
 	$(MAKE) $(INST)/$(ZLIB)
-	$(MAKE) $(INST)/$(MPIR)
+	$(MAKE) $(INST)/$(SAGE_MP_LIBRARY)
 	$(MAKE) $(INST)/$(MPFR)
 	$(MAKE) $(INST)/$(MPC)
 	$(MAKE) $(INST)/$(PPL)
@@ -172,6 +172,9 @@ $(INST)/$(BZIP2): $(INST)/prereq $(INST)/$(PKGCONF)
 # Building normal packages
 ###############################################################################
 
+$(INST)/$(SAGE_MP_LIBRARY): $(INST)/$(ICONV)
+	+$(PIPE) "$(SAGE_SPKG) $(SAGE_MP_LIBRARY) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGE_MP_LIBRARY).log"
+
 $(INST)/$(ATLAS): | $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log"
 
@@ -210,30 +213,27 @@ $(INST)/$(CONWAY): | $(SAGERUNTIME)
 $(INST)/$(GRAPHS):
 	+$(PIPE) "$(SAGE_SPKG) $(GRAPHS) 2>&1" "tee -a $(SAGE_LOGS)/$(GRAPHS).log"
 
-$(INST)/$(GLPK): $(INST)/$(MPIR) $(INST)/$(ZLIB)
+$(INST)/$(GLPK): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GLPK) 2>&1" "tee -a $(SAGE_LOGS)/$(GLPK).log"
 
 $(INST)/$(PYTHON): $(INST)/$(ZLIB) $(INST)/$(READLINE) \
                    $(INST)/$(SQLITE) $(INST)/$(LIBPNG) \
                    | $(INST)/$(BZIP2)
 	+$(PIPE) "$(SAGE_SPKG) $(PYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(PYTHON).log"
 
-$(INST)/$(MPIR): $(INST)/$(ICONV)
-	+$(PIPE) "$(SAGE_SPKG) $(MPIR) 2>&1" "tee -a $(SAGE_LOGS)/$(MPIR).log"
-
 $(INST)/$(GSL): $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(GSL) 2>&1" "tee -a $(SAGE_LOGS)/$(GSL).log"
 
 $(INST)/$(GF2X):
 	+$(PIPE) "$(SAGE_SPKG) $(GF2X) 2>&1" "tee -a $(SAGE_LOGS)/$(GF2X).log"
 
-$(INST)/$(NTL): $(INST)/$(MPIR) $(INST)/$(GF2X)
+$(INST)/$(NTL): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(GF2X)
 	+$(PIPE) "$(SAGE_SPKG) $(NTL) 2>&1" "tee -a $(SAGE_LOGS)/$(NTL).log"
 
-$(INST)/$(FPLLL): $(INST)/$(MPIR) $(INST)/$(MPFR)
+$(INST)/$(FPLLL): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(FPLLL) 2>&1" "tee -a $(SAGE_LOGS)/$(FPLLL).log"
 
-$(INST)/$(PARI): $(INST)/$(READLINE) $(INST)/$(MPIR) \
+$(INST)/$(PARI): $(INST)/$(READLINE) $(INST)/$(SAGE_MP_LIBRARY) \
     | $(INST)/$(PARI_GALDATA) $(INST)/$(PARI_SEADATA_SMALL)
 	+$(PIPE) "$(SAGE_SPKG) $(PARI) 2>&1" "tee -a $(SAGE_LOGS)/$(PARI).log"
 
@@ -243,6 +243,9 @@ $(INST)/$(PARI_GALDATA):
 $(INST)/$(PARI_SEADATA_SMALL):
 	+$(PIPE) "$(SAGE_SPKG) $(PARI_SEADATA_SMALL) 2>&1" "tee -a $(SAGE_LOGS)/$(PARI_SEADATA_SMALL).log"
 
+$(INST)/$(PIP): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+	+$(PIPE) "$(SAGE_SPKG) $(PIP) 2>&1" "tee -a $(SAGE_LOGS)/$(PIP).log"
+
 $(INST)/$(POLYBORI): $(INST)/$(PYTHON) $(INST)/$(IPYTHON) \
          $(INST)/$(SCONS) $(INST)/$(BOOST_CROPPED) \
          $(INST)/$(M4RI) $(INST)/$(GD)
@@ -251,34 +254,34 @@ $(INST)/$(POLYBORI): $(INST)/$(PYTHON) $(INST)/$(IPYTHON) \
 $(INST)/$(POLYTOPES_DB):
 	+$(PIPE) "$(SAGE_SPKG) $(POLYTOPES_DB) 2>&1" "tee -a $(SAGE_LOGS)/$(POLYTOPES_DB).log"
 
-$(INST)/$(PPL): $(INST)/$(MPIR) $(INST)/$(GLPK)
+$(INST)/$(PPL): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(GLPK)
 	+$(PIPE) "$(SAGE_SPKG) $(PPL) 2>&1" "tee -a $(SAGE_LOGS)/$(PPL).log"
 
-$(INST)/$(MPC): $(INST)/$(MPIR) $(INST)/$(MPFR)
+$(INST)/$(MPC): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(MPC) 2>&1" "tee -a $(SAGE_LOGS)/$(MPC).log"
 
-$(INST)/$(MPFR): $(INST)/$(MPIR)
+$(INST)/$(MPFR): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(MPFR) 2>&1" "tee -a $(SAGE_LOGS)/$(MPFR).log"
 
-$(INST)/$(MPFI): $(INST)/$(MPIR) $(INST)/$(MPFR)
+$(INST)/$(MPFI): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(MPFI) 2>&1" "tee -a $(SAGE_LOGS)/$(MPFI).log"
 
-$(INST)/$(GIVARO): $(INST)/$(MPIR)
+$(INST)/$(GIVARO): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(GIVARO) 2>&1" "tee -a $(SAGE_LOGS)/$(GIVARO).log"
 
 $(INST)/$(GIT): $(INST)/$(ZLIB) $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(GIT) 2>&1" "tee -a $(SAGE_LOGS)/$(GIT).log"
 
-$(INST)/$(FFLASFFPACK): $(INST)/$(MPIR) $(INST)/$(GIVARO) \
+$(INST)/$(FFLASFFPACK): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(GIVARO) \
 	$(INST)/$(GSL) $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(FFLASFFPACK) 2>&1" "tee -a $(SAGE_LOGS)/$(FFLASFFPACK).log"
 
-$(INST)/$(LINBOX): $(INST)/$(MPIR) $(INST)/$(NTL) $(INST)/$(GIVARO) \
+$(INST)/$(LINBOX): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(NTL) $(INST)/$(GIVARO) \
                    $(INST)/$(MPFR) $(INST)/$(FPLLL) $(INST)/$(IML) \
                    $(INST)/$(M4RI) $(INST)/$(M4RIE) $(INST)/$(FFLASFFPACK)
 	+$(PIPE) "$(SAGE_SPKG) $(LINBOX) 2>&1" "tee -a $(SAGE_LOGS)/$(LINBOX).log"
 
-$(INST)/$(IML): $(INST)/$(MPIR) $(INST)/$(GSL) $(INST)/$(ATLAS)
+$(INST)/$(IML): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(GSL) $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(IML) 2>&1" "tee -a $(SAGE_LOGS)/$(IML).log"
 
 $(INST)/$(PALP):
@@ -299,7 +302,7 @@ $(INST)/$(SYMPOW):
 $(INST)/$(SYMMETRICA):
 	+$(PIPE) "$(SAGE_SPKG) $(SYMMETRICA) 2>&1" "tee -a $(SAGE_LOGS)/$(SYMMETRICA).log"
 
-$(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(MPIR)
+$(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(GAP) 2>&1" "tee -a $(SAGE_LOGS)/$(GAP).log"
 
 $(INST)/$(LIBGAP): $(INST)/$(GAP)
@@ -336,7 +339,7 @@ $(INST)/$(SAGETEX): $(INST)/$(PYTHON) $(INST)/$(MAXIMA) $(INST)/$(SCIPY) \
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(SETUPTOOLS) 2>&1" "tee -a $(SAGE_LOGS)/$(SETUPTOOLS).log"
 
-$(INST)/$(SINGULAR): $(INST)/$(MPIR) $(INST)/$(NTL) $(INST)/$(FLINT) \
+$(INST)/$(SINGULAR): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(NTL) $(INST)/$(FLINT) \
 		     $(INST)/$(READLINE) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(SINGULAR) 2>&1" "tee -a $(SAGE_LOGS)/$(SINGULAR).log"
 
@@ -386,22 +389,22 @@ $(INST)/$(MATPLOTLIB): $(INST)/$(PYTHON) $(INST)/$(NUMPY) \
                        $(INST)/$(TORNADO) $(INST)/$(SIX)
 	+$(PIPE) "$(SAGE_SPKG) $(MATPLOTLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(MATPLOTLIB).log"
 
-$(INST)/$(CDDLIB): $(INST)/$(MPIR)
+$(INST)/$(CDDLIB): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(CDDLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(CDDLIB).log"
 
-$(INST)/$(GFAN): $(INST)/$(MPIR) $(INST)/$(CDDLIB)
+$(INST)/$(GFAN): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(CDDLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GFAN) 2>&1" "tee -a $(SAGE_LOGS)/$(GFAN).log"
 
 $(INST)/$(TACHYON): $(INST)/$(LIBPNG)
 	+$(PIPE) "$(SAGE_SPKG) $(TACHYON) 2>&1" "tee -a $(SAGE_LOGS)/$(TACHYON).log"
 
-$(INST)/$(ECM): $(INST)/$(MPIR)
+$(INST)/$(ECM): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(ECM) 2>&1" "tee -a $(SAGE_LOGS)/$(ECM).log"
 
-$(INST)/$(RATPOINTS): $(INST)/$(MPIR)
+$(INST)/$(RATPOINTS): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(RATPOINTS) 2>&1" "tee -a $(SAGE_LOGS)/$(RATPOINTS).log"
 
-$(INST)/$(ECL): $(INST)/$(MPIR) $(INST)/$(READLINE) $(INST)/$(BOEHM_GC)
+$(INST)/$(ECL): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(READLINE) $(INST)/$(BOEHM_GC)
 	+$(PIPE) "$(SAGE_SPKG) $(ECL) 2>&1" "tee -a $(SAGE_LOGS)/$(ECL).log"
 
 $(INST)/$(MAXIMA): $(INST)/$(ECL)
@@ -419,10 +422,10 @@ $(INST)/$(SYMPY): $(INST)/$(PYTHON) $(INST)/$(MPMATH)
 $(INST)/$(CYTHON): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(CYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(CYTHON).log"
 
-$(INST)/$(FLINTQS): $(INST)/$(MPIR)
+$(INST)/$(FLINTQS): $(INST)/$(SAGE_MP_LIBRARY)
 	+$(PIPE) "$(SAGE_SPKG) $(FLINTQS) 2>&1" "tee -a $(SAGE_LOGS)/$(FLINTQS).log"
 
-$(INST)/$(FLINT): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(NTL)
+$(INST)/$(FLINT): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR) $(INST)/$(NTL)
 	+$(PIPE) "$(SAGE_SPKG) $(FLINT) 2>&1" "tee -a $(SAGE_LOGS)/$(FLINT).log"
 
 $(INST)/$(ECLIB): $(INST)/$(PARI) $(INST)/$(NTL) $(INST)/$(FLINT)
@@ -436,16 +439,13 @@ $(INST)/$(M4RIE): $(INST)/$(M4RI) $(INST)/$(GIVARO) $(INST)/$(NTL)
 
 # zn_poly really does depend on Python, despite this is far from obvious.
 # The 'configure' script in zn_poly calls Python to make a 'makefile'.
-$(INST)/$(ZNPOLY): $(INST)/$(MPIR) | $(INST)/$(PYTHON)
+$(INST)/$(ZNPOLY): $(INST)/$(SAGE_MP_LIBRARY) | $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ZNPOLY) 2>&1" "tee -a $(SAGE_LOGS)/$(ZNPOLY).log"
 
 $(INST)/$(SAGENB): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(PEXPECT) \
                    $(INST)/$(JINJA2) $(INST)/$(SPHINX) $(INST)/$(DOCUTILS)
 	+$(PIPE) "$(SAGE_SPKG) $(SAGENB) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGENB).log"
 
-$(INST)/$(SQLALCHEMY): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
-	+$(PIPE) "$(SAGE_SPKG) $(SQLALCHEMY) 2>&1" "tee -a $(SAGE_LOGS)/$(SQLALCHEMY).log"
-
 $(INST)/$(SPHINX): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(DOCUTILS) \
                    $(INST)/$(JINJA2) $(INST)/$(PYGMENTS)
 	+$(PIPE) "$(SAGE_SPKG) $(SPHINX) 2>&1" "tee -a $(SAGE_LOGS)/$(SPHINX).log"
@@ -459,7 +459,7 @@ $(INST)/$(PYGMENTS): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 # List all *build-time* dependencies of the Sage library.  These are,
 # on the one hand, programs needed for the build/install process of the
 # Sage library (e.g. JINJA2), and on the
-# other hand all dependencies for Cython files (e.g. PARI, NTL, MPIR).
+# other hand all dependencies for Cython files (e.g. PARI, NTL, SAGE_MP_LIBRARY).
 $(INST)/sage: \
 		 $(INST)/$(ATLAS) \
 		 $(INST)/$(CEPHES) \
@@ -486,7 +486,7 @@ $(INST)/sage: \
 		 $(INST)/$(MPC) \
 		 $(INST)/$(MPFI) \
 		 $(INST)/$(MPFR) \
-		 $(INST)/$(MPIR) \
+		 $(INST)/$(SAGE_MP_LIBRARY) \
 		 $(INST)/$(NTL) \
 		 $(INST)/$(NUMPY) \
 		 $(INST)/$(PARI) \
@@ -507,7 +507,7 @@ $(INST)/sage: \
 	fi
 
 $(INST)/csage: $(INST)/$(SCONS) \
-       $(INST)/$(MPIR) \
+       $(INST)/$(SAGE_MP_LIBRARY) \
        $(INST)/$(NTL) \
        $(INST)/$(PARI) \
        $(INST)/$(PYTHON)
@@ -521,7 +521,7 @@ $(INST)/ccache: $(BASE) $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) ccache 2>&1" "tee -a $(SAGE_LOGS)/ccache.log"
 	touch $(INST)/ccache
 
-$(INST)/$(GCC): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(MPC) \
+$(INST)/$(GCC): $(INST)/$(SAGE_MP_LIBRARY) $(INST)/$(MPFR) $(INST)/$(MPC) \
                 $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GCC) 2>&1" "tee -a $(SAGE_LOGS)/$(GCC).log"
 

build/install

@@ -60,6 +60,41 @@ mkdir -p "$SAGE_LOCAL/lib"
 mkdir -p "$SAGE_SPKG_INST"
 mkdir -p "$SAGE_SHARE"
 
+###############################################################################
+# Determine whether to use MPIR (default standard pkg) or GMP (optional pkg).
+###############################################################################
+
+if [ -z "$SAGE_MP_LIBRARY" ]; then
+    # Automatic detection of installed MP library.
+    if [ ! -f "$SAGE_LOCAL/share/mp_config" ]; then
+        echo "MPIR" > "$SAGE_LOCAL/share/mp_config"
+    fi
+    SAGE_MP_LIBRARY=`cat "$SAGE_LOCAL/share/mp_config"`
+else
+    if [ -f "$SAGE_LOCAL/share/mp_config" -a "$SAGE_MP_LIBRARY" != `cat "$SAGE_LOCAL/share/mp_config"` ]; then
+        echo "SAGE_MP_LIBRARY differs from the value stored in"
+        echo "\"$SAGE_LOCAL/share/mp_config\"."
+        echo "This is not supported; you should rebuild Sage from scratch"
+        echo "using the new SAGE_MP_LIBRARY value."
+        exit 1
+    fi
+
+    case "$SAGE_MP_LIBRARY" in
+        MPIR|GMP)
+            echo "Using $SAGE_MP_LIBRARY as default MP library."
+            echo $SAGE_MP_LIBRARY > "$SAGE_LOCAL/share/mp_config"
+            ;;
+        *)
+            echo "Allowed values for SAGE_MP_LIBRARY are \"MPIR\" and \"GMP\"."
+            echo "If you did not set this variable, check the content of"
+            echo "\"$SAGE_LOCAL/share/mp_config\"."
+            exit 1
+            ;;
+    esac
+fi
+
+export SAGE_MP_LIBRARY
+
 ###############################################################################
 # Determine whether to install GCC (gcc, g++, gfortran).
 ###############################################################################
@@ -90,17 +125,11 @@ if [ -z "$FC" ]; then
 fi
 
 if [ -f "$SAGE_LOCAL/bin/gcc" ]; then
-    # GCC is already installed. To disable unneeded rebuilding
-    # of GCC, we touch the installed file for GCC, such that it will
-    # really only be built if one of its dependencies has been upgraded.
-    echo >&2 "GCC was installed before, it will get re-installed if needed."
-    need_to_install_gcc=yes
-    for f in "$SAGE_SPKG_INST"/gcc-*; do
-        if [ -f "$f" ]; then
-            touch "$f"
-        fi
-    done
-elif [ -n "$SAGE_INSTALL_GCC" ]; then
+    # Ignore SAGE_INSTALL_GCC if GCC is already installed
+    SAGE_INSTALL_GCC=""
+fi
+
+if [ -n "$SAGE_INSTALL_GCC" ]; then
     # Check the value of the environment variable SAGE_INSTALL_GCC
     case "$SAGE_INSTALL_GCC" in
         yes)
@@ -119,7 +148,7 @@ else
 
     # Check whether $CXX is some version of GCC.  If it's a different
     # compiler, install GCC.
-    CXXtype=`testcxx.sh $CXX`
+    CXXtype=`source sage-env; testcxx.sh $CXX`
     if [ "$CXXtype" != GCC ]; then
         echo >&2 "Installing GCC because your '$CXX' isn't GCC (GNU C++)."
         need_to_install_gcc=yes
@@ -316,7 +345,6 @@ MAXIMA=`newest_version maxima`
 MPC=`newest_version mpc`
 MPFI=`newest_version mpfi`
 MPFR=`newest_version mpfr`
-MPIR=`newest_version mpir`
 MPMATH=`newest_version mpmath`
 NETWORKX=`newest_version networkx`
 NTL=`newest_version ntl`
@@ -328,6 +356,7 @@ PARI_SEADATA_SMALL=`newest_version pari_seadata_small`
 PATCH=`newest_version patch`
 PEXPECT=`newest_version pexpect`
 PILLOW=`newest_version pillow`
+PIP=`newest_version pip`
 PKGCONF=`newest_version pkgconf`
 PKGCONFIG=`newest_version pkgconfig`
 POLYBORI=`newest_version polybori`
@@ -352,7 +381,6 @@ SETUPTOOLS=`newest_version setuptools`
 SINGULAR=`newest_version singular`
 SIX=`newest_version six`
 SPHINX=`newest_version sphinx`
-SQLALCHEMY=`newest_version sqlalchemy`
 SQLITE=`newest_version sqlite`
 SYMMETRICA=`newest_version symmetrica`
 SYMPOW=`newest_version sympow`
@@ -369,6 +397,14 @@ INST=`echo "$SAGE_SPKG_INST" | sed 's/ /\\\\ /g'`
 
 EOF
 
+# Sage MP library
+sage_mp_library=`echo "$SAGE_MP_LIBRARY" | tr '[A-Z]' '[a-z]'`
+cat >&5 << EOF
+# Sage MP library
+SAGE_MP_LIBRARY=`newest_version $sage_mp_library`
+
+EOF
+
 # $(TOOLCHAIN) variable containing prerequisites for the build
 echo >&5 -n 'TOOLCHAIN ='
 if [ "$SAGE_INSTALL_CCACHE" = yes ]; then