Merge branch 'develop' of git://trac.sagemath.org/sage into ticket/17324

sagemath · Dec 2, 2014 · a02a1e1 · a02a1e1
2 parents 218c56b + f16112c
commit a02a1e1
Show file tree

Hide file tree

Showing 654 changed files with 36,391 additions and 14,106 deletions.
diff --git a/COPYING.txt b/COPYING.txt
@@ -54,7 +54,7 @@ gcc                         GPLv3+
 gd                          Custom (BSD-ish)
 gdmodule                    Custom (BSD-ish)
 genus2reduction             GPLv2+
-gfan                        GPLv2+
+gfan                        GPLv2 or GPLv3
 gf2x                        GPLv2+
 givaro                      CeCILL-B (BSD-ish)
 glpk                        GPLv3+

diff --git a/README.txt b/README.txt
@@ -64,7 +64,7 @@ QUICK INSTRUCTIONS TO BUILD FROM SOURCE
 
 The following steps briefly outline the process of building Sage from
 source. More detailed instructions, including how to build faster on
-multicore machines are contained later in this README and in the
+multicore machines, are contained later in this README and in the
 Installation Guide:
 
     http://www.sagemath.org/doc/installation

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-Sage version 6.4.beta6, released 2014-10-14
+Sage version 6.5.beta1, released 2014-11-23
diff --git a/build/deps b/build/deps
@@ -143,12 +143,9 @@ SAGERUNTIME = $(SCRIPTS) $(INST)/sage $(INST)/$(SAGENB) $(INST)/$(IPYTHON)
 ###############################################################################
 # Building the base system
 #
-# This consists of packages which are required for the Sage build system
-# but not for Sage itself.  Since nothing explicitly depends on these,
-# an update of these packages will not trigger a rebuild of every other
-# package during an upgrade, see #13415.
+# This consists of packages which are required for the Sage build system.
 ###############################################################################
-base: $(INST)/prereq $(INST)/$(BZIP2) $(INST)/$(PATCH)
+base: $(INST)/prereq $(INST)/$(BZIP2) $(INST)/$(PATCH) $(INST)/$(PKGCONF)
 
 $(INST)/prereq: ../configure
 	@cd ..; rm -f config.log; ln -s logs/pkgs/config.log config.log; \
@@ -175,10 +172,10 @@ $(INST)/$(BZIP2): $(INST)/prereq $(INST)/$(PKGCONF)
 # Building normal packages
 ###############################################################################
 
-$(INST)/$(ATLAS): $(INST)/$(PYTHON)
+$(INST)/$(ATLAS): | $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ATLAS) 2>&1" "tee -a $(SAGE_LOGS)/$(ATLAS).log"
 
-$(INST)/$(BOEHM_GC): $(INST)/$(PKGCONF)
+$(INST)/$(BOEHM_GC):
 	+$(PIPE) "$(SAGE_SPKG) $(BOEHM_GC) 2>&1" "tee -a $(SAGE_LOGS)/$(BOEHM_GC).log"
 
 $(INST)/$(BOOST_CROPPED):
@@ -190,7 +187,7 @@ $(INST)/$(CLIQUER):
 $(INST)/$(COMBINATORIAL_DESIGNS):
 	+$(PIPE) "$(SAGE_SPKG) $(COMBINATORIAL_DESIGNS) 2>&1" "tee -a $(SAGE_LOGS)/$(COMBINATORIAL_DESIGNS).log"
 
-$(INST)/$(NCURSES): $(INST)/$(PKGCONF)
+$(INST)/$(NCURSES):
 	+$(PIPE) "$(SAGE_SPKG) $(NCURSES) 2>&1" "tee -a $(SAGE_LOGS)/$(NCURSES).log"
 
 $(INST)/$(READLINE): $(INST)/$(NCURSES)
@@ -202,12 +199,12 @@ $(INST)/$(ICONV):
 $(INST)/$(DOCUTILS): $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(DOCUTILS) 2>&1" "tee -a $(SAGE_LOGS)/$(DOCUTILS).log"
 
-$(INST)/$(ELLIPTIC_CURVES): $(INST)/$(PYTHON) $(INST)/$(SQLITE)
+$(INST)/$(ELLIPTIC_CURVES): | $(INST)/$(SQLITE) $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ELLIPTIC_CURVES) 2>&1" "tee -a $(SAGE_LOGS)/$(ELLIPTIC_CURVES).log"
 
 # CONWAY depends on depends on SAGERUNTIME because it runs Sage code to
 # generate a Sage object (.sobj).
-$(INST)/$(CONWAY): $(SAGERUNTIME)
+$(INST)/$(CONWAY): | $(SAGERUNTIME)
 	+$(PIPE) "$(SAGE_SPKG) $(CONWAY) 2>&1" "tee -a $(SAGE_LOGS)/$(CONWAY).log"
 
 $(INST)/$(GRAPHS):
@@ -216,8 +213,9 @@ $(INST)/$(GRAPHS):
 $(INST)/$(GLPK): $(INST)/$(MPIR) $(INST)/$(ZLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(GLPK) 2>&1" "tee -a $(SAGE_LOGS)/$(GLPK).log"
 
-$(INST)/$(PYTHON): $(INST)/$(ZLIB) $(INST)/$(BZIP2) $(INST)/$(PKGCONF) \
-		   $(INST)/$(READLINE) $(INST)/$(SQLITE) $(INST)/$(LIBPNG)
+$(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)
@@ -236,7 +234,7 @@ $(INST)/$(FPLLL): $(INST)/$(MPIR) $(INST)/$(MPFR)
 	+$(PIPE) "$(SAGE_SPKG) $(FPLLL) 2>&1" "tee -a $(SAGE_LOGS)/$(FPLLL).log"
 
 $(INST)/$(PARI): $(INST)/$(READLINE) $(INST)/$(MPIR) \
-    $(INST)/$(PARI_GALDATA) $(INST)/$(PARI_SEADATA_SMALL)
+    | $(INST)/$(PARI_GALDATA) $(INST)/$(PARI_SEADATA_SMALL)
 	+$(PIPE) "$(SAGE_SPKG) $(PARI) 2>&1" "tee -a $(SAGE_LOGS)/$(PARI).log"
 
 $(INST)/$(PARI_GALDATA):
@@ -307,7 +305,7 @@ $(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(MPIR)
 $(INST)/$(LIBGAP): $(INST)/$(GAP)
 	+$(PIPE) "$(SAGE_SPKG) $(LIBGAP) 2>&1" "tee -a $(SAGE_LOGS)/$(LIBGAP).log"
 
-$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO)
+$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) $(INST)/$(PYZMQ)
 	+$(PIPE) "$(SAGE_SPKG) $(IPYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(IPYTHON).log"
 
 $(INST)/$(PEXPECT): $(INST)/$(PYTHON)
@@ -330,9 +328,9 @@ $(INST)/$(SQLITE): $(INST)/$(READLINE)
 
 # To build SageTeX, you just need Python, but to test (SAGE_CHECK=yes)
 # SageTeX, you actually need to run Sage, produce plots,...
-$(INST)/$(SAGETEX): $(INST)/$(PYTHON) \
-                    $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(SCIPY) \
-                    $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) $(INST)/$(TACHYON)
+$(INST)/$(SAGETEX): $(INST)/$(PYTHON) $(INST)/$(MAXIMA) $(INST)/$(SCIPY) \
+                    $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) $(INST)/$(TACHYON) \
+                    | $(SAGERUNTIME)
 	+$(PIPE) "$(SAGE_SPKG) $(SAGETEX) 2>&1" "tee -a $(SAGE_LOGS)/$(SAGETEX).log"
 
 $(INST)/$(SETUPTOOLS): $(INST)/$(PYTHON)
@@ -357,7 +355,7 @@ $(INST)/$(ZEROMQ):
 $(INST)/$(ZLIB):
 	+$(PIPE) "$(SAGE_SPKG) $(ZLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(ZLIB).log"
 
-$(INST)/$(JMOL): $(INST)/$(SAGENB)
+$(INST)/$(JMOL): | $(INST)/$(SAGENB)
 	+$(PIPE) "$(SAGE_SPKG) $(JMOL) 2>&1" "tee -a $(SAGE_LOGS)/$(JMOL).log"
 
 $(INST)/$(FREETYPE): $(INST)/$(LIBPNG)
@@ -382,10 +380,10 @@ $(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(TORNADO) 2>&1" "tee -a $(SAGE_LOGS)/$(TORNADO).log"
 
 $(INST)/$(MATPLOTLIB): $(INST)/$(PYTHON) $(INST)/$(NUMPY) \
-		       $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) \
-		       $(INST)/$(GDMODULE) $(INST)/$(DATEUTIL) \
-		       $(INST)/$(PKGCONF) $(INST)/$(PYPARSING) \
-		       $(INST)/$(SETUPTOOLS) $(INST)/$(TORNADO) $(INST)/$(SIX)
+                       $(INST)/$(FREETYPE) $(INST)/$(LIBPNG) \
+                       $(INST)/$(GDMODULE) $(INST)/$(DATEUTIL) \
+                       $(INST)/$(PYPARSING) $(INST)/$(SETUPTOOLS) \
+                       $(INST)/$(TORNADO) $(INST)/$(SIX)
 	+$(PIPE) "$(SAGE_SPKG) $(MATPLOTLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(MATPLOTLIB).log"
 
 $(INST)/$(CDDLIB): $(INST)/$(MPIR)
@@ -409,7 +407,7 @@ $(INST)/$(ECL): $(INST)/$(MPIR) $(INST)/$(READLINE) $(INST)/$(BOEHM_GC)
 $(INST)/$(MAXIMA): $(INST)/$(ECL)
 	+$(PIPE) "$(SAGE_SPKG) $(MAXIMA) 2>&1" "tee -a $(SAGE_LOGS)/$(MAXIMA).log"
 
-$(INST)/$(R): $(INST)/$(ATLAS) $(INST)/$(ICONV) $(INST)/$(READLINE) $(INST)/$(PKGCONF)
+$(INST)/$(R): $(INST)/$(ATLAS) $(INST)/$(ICONV) $(INST)/$(READLINE)
 	+$(PIPE) "$(SAGE_SPKG) $(R) 2>&1" "tee -a $(SAGE_LOGS)/$(R).log"
 
 $(INST)/$(RPY): $(INST)/$(PYTHON) $(INST)/$(R)
@@ -418,7 +416,7 @@ $(INST)/$(RPY): $(INST)/$(PYTHON) $(INST)/$(R)
 $(INST)/$(SYMPY): $(INST)/$(PYTHON) $(INST)/$(MPMATH)
 	+$(PIPE) "$(SAGE_SPKG) $(SYMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(SYMPY).log"
 
-$(INST)/$(CYTHON): $(INST)/$(PYTHON)
+$(INST)/$(CYTHON): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(CYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(CYTHON).log"
 
 $(INST)/$(FLINTQS): $(INST)/$(MPIR)
@@ -430,15 +428,15 @@ $(INST)/$(FLINT): $(INST)/$(MPIR) $(INST)/$(MPFR) $(INST)/$(NTL)
 $(INST)/$(ECLIB): $(INST)/$(PARI) $(INST)/$(NTL) $(INST)/$(FLINT)
 	+$(PIPE) "$(SAGE_SPKG) $(ECLIB) 2>&1" "tee -a $(SAGE_LOGS)/$(ECLIB).log"
 
-$(INST)/$(M4RI): $(INST)/$(LIBPNG) $(INST)/$(PKGCONF)
+$(INST)/$(M4RI): $(INST)/$(LIBPNG)
 	+$(PIPE) "$(SAGE_SPKG) $(M4RI) 2>&1" "tee -a $(SAGE_LOGS)/$(M4RI).log"
 
 $(INST)/$(M4RIE): $(INST)/$(M4RI) $(INST)/$(GIVARO) $(INST)/$(NTL)
 	+$(PIPE) "$(SAGE_SPKG) $(M4RIE) 2>&1" "tee -a $(SAGE_LOGS)/$(M4RIE).log"
 
 # 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)/$(MPIR) | $(INST)/$(PYTHON)
 	+$(PIPE) "$(SAGE_SPKG) $(ZNPOLY) 2>&1" "tee -a $(SAGE_LOGS)/$(ZNPOLY).log"
 
 $(INST)/$(SAGENB): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS) $(INST)/$(PEXPECT) \
@@ -533,16 +531,17 @@ $(INST)/$(PILLOW): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 $(INST)/$(PKGCONFIG): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
 	+$(PIPE) "$(SAGE_SPKG) $(PKGCONFIG) 2>&1" "tee -a $(SAGE_LOGS)/$(PKGCONFIG).log"
 
-$(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS) $(INST)/$(PKGCONF)
+$(INST)/$(NUMPY): $(INST)/$(PYTHON) $(INST)/$(ATLAS)
 	+$(PIPE) "$(SAGE_SPKG) $(NUMPY) 2>&1" "tee -a $(SAGE_LOGS)/$(NUMPY).log"
 
 $(INST)/$(SCIPY): $(INST)/$(ATLAS) $(INST)/$(NUMPY)
 	+$(PIPE) "$(SAGE_SPKG) $(SCIPY) 2>&1" "tee -a $(SAGE_LOGS)/$(SCIPY).log"
 
 # matplotlib is needed to test cvxopt (i.e., if SAGE_CHECK=yes). See #12742.
 $(INST)/$(CVXOPT): $(INST)/$(NUMPY) \
-		   $(INST)/$(ATLAS) $(INST)/$(CEPHES) \
-		   $(INST)/$(GSL) $(INST)/$(GLPK) $(INST)/$(MATPLOTLIB)
+                   $(INST)/$(ATLAS) $(INST)/$(CEPHES) \
+                   $(INST)/$(GSL) $(INST)/$(GLPK) \
+                   | $(INST)/$(MATPLOTLIB)
 	+$(PIPE) "$(SAGE_SPKG) $(CVXOPT) 2>&1" "tee -a $(SAGE_LOGS)/$(CVXOPT).log"
 
 $(INST)/$(CEPHES):

diff --git a/build/install b/build/install
@@ -13,7 +13,13 @@ SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
 SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
 SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
 SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
+
+if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
+    SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
+    SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
+fi
 PATH="$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
+
 PYTHONPATH="$SAGE_LOCAL"
 export SAGE_ROOT SAGE_SRC SAGE_LOCAL SAGE_EXTCODE SAGE_LOGS SAGE_SPKG_INST SAGE_VERSION PATH PYTHONPATH
 
@@ -63,13 +69,13 @@ mkdir -p "$SAGE_SHARE"
 # install GCC.  The "real" $CC, $CXX,... variables for building Sage are
 # set in sage-env.
 
-if [ -z "$CC" ]; then
-    CC=gcc
+if [ -z "$CXX" ]; then
+    CXX=g++
 fi
 
-if [ -z "$CXX" ]; then
-    if command -v g++ >/dev/null 2>/dev/null; then
-        CXX=g++
+if [ -z "$CC" ]; then
+    if command -v gcc >/dev/null 2>/dev/null; then
+        CC=gcc
     fi
 fi
 
@@ -111,63 +117,57 @@ else
     # SAGE_INSTALL_GCC is not set, install GCC when needed.
     need_to_install_gcc=no
 
-    # Check whether $CC is some version of GCC.  If it's a different
+    # Check whether $CXX is some version of GCC.  If it's a different
     # compiler, install GCC.
-    CCtype=`testcc.sh $CC`
-    if [ "$CCtype" != GCC ]; then
-        echo >&2 "Installing GCC because your '$CC' isn't GCC (GNU CC)."
+    CXXtype=`testcxx.sh $CXX`
+    if [ "$CXXtype" != GCC ]; then
+        echo >&2 "Installing GCC because your '$CXX' isn't GCC (GNU C++)."
         need_to_install_gcc=yes
     else
-        # $CC points to some version of GCC, find out which version.
-        GCCVERSION=`$CC -dumpversion`
+        # $CXX points to some version of GCC, find out which version.
+        GCCVERSION=`$CXX -dumpversion`
         case $GCCVERSION in
             [0-3].*|4.[0-3]|4.[0-3].*)
                 # Install our own GCC if the system-provided one is older than gcc-4.4.
                 # * gcc-4.2.4 compiles a slow IML:
                 # https://groups.google.com/forum/?fromgroups#!topic/sage-devel/Ux3t0dW2FSI
                 # * gcc-4.3 might have trouble building ATLAS:
                 # https://groups.google.com/forum/?fromgroups#!topic/sage-devel/KCeFqQ_w2FE
-                echo >&2 "Installing GCC because you have $CC version $GCCVERSION, which is quite old."
+                echo >&2 "Installing GCC because you have $CXX version $GCCVERSION, which is quite old."
                 need_to_install_gcc=yes;;
-            4.4*|4.5*)
+            4.4.*|4.5.*)
                 # GCC 4.4.x and GCC 4.5.x fail to compile PARI/GP on ia64:
                 # * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46044
                 if [ x`uname -m` = xia64 ]; then
-                    echo >&2 "Installing GCC because you have $CC version $GCCVERSION on ia64."
+                    echo >&2 "Installing GCC because you have $CXX version $GCCVERSION on ia64."
                     echo >&2 "gcc <= 4.5 fails to compile PARI/GP on ia64."
                     need_to_install_gcc=yes
                 fi;;
-            4.6.[01])
-                # Also install GCC if we have version 4.6.0 or 4.6.1, which is
+            4.6.*)
+                # Also install GCC if we have version 4.6.* which is
                 # known to give trouble within Sage:
                 # * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48702
                 # * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48774
-                echo >&2 "Installing GCC because you have $CC version $GCCVERSION."
-                echo >&2 "gcc-4.6.0 and gcc-4.6.1 have known bugs affecting Sage."
-                need_to_install_gcc=yes;;
-            4.6*)
-                # GCC 4.6.x doesn't compile ECL on Cygwin:
                 # * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52061
-                if uname | grep CYGWIN >/dev/null; then
-                    echo >&2 "Installing GCC because you have $CC version $GCCVERSION on Cygwin."
-                    echo >&2 "gcc-4.6.x fails to compile ECL on Cygwin."
-                    need_to_install_gcc=yes
-                fi;;
+                # * https://groups.google.com/d/msg/sage-release/xgmJ3nAcUOY/jH8OZjftYRsJ
+                echo >&2 "Installing GCC because you have $CXX version $GCCVERSION."
+                echo >&2 "gcc-4.6.* has known bugs affecting Sage."
+                need_to_install_gcc=yes;;
             4.7.0)
                 # GCC 4.7.0 is very broken on ia64, see
                 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48496
                 # This is fixed in GCC 4.7.1.
                 if [ x`uname -m` = xia64 ]; then
-                    echo >&2 "Installing GCC because you have $CC version $GCCVERSION on ia64."
+                    echo >&2 "Installing GCC because you have $CXX version $GCCVERSION on ia64."
                     echo >&2 "gcc-4.7.0 has a serious bug on ia64."
                     need_to_install_gcc=yes
                 fi;;
         esac
     fi
 
-    # Check C++ and Fortran compilers.
-    if [ -z "$CXX" ]; then
-        echo >&2 "Installing GCC because a C++ compiler is missing."
+    # Check C, C++ and Fortran compilers.
+    if [ -z "$CC" ]; then
+        echo >&2 "Installing GCC because a C compiler is missing."
         need_to_install_gcc=yes
     fi
 
@@ -178,17 +178,17 @@ else
 fi
 
 # If we are not installing GCC: check that the assembler and linker
-# used by $CC match $AS and $LD.
+# used by $CXX match $AS and $LD.
 # See http://trac.sagemath.org/sage_trac/ticket/14296
 if [ $need_to_install_gcc != yes ]; then
     if [ "$AS" != "" ]; then
-        CC_as=`$CC -print-file-name=as 2>/dev/null`
-        CC_as=`command -v $CC_as 2>/dev/null`
+        CXX_as=`$CXX -print-file-name=as 2>/dev/null`
+        CXX_as=`command -v $CXX_as 2>/dev/null`
         cmd_AS=`command -v $AS`
 
-        if [ "$CC_as" != "" -a "$CC_as" != "$cmd_AS" ]; then
+        if [ "$CXX_as" != "" -a "$CXX_as" != "$cmd_AS" ]; then
             echo >&2 "Error: Mismatch of assemblers between"
-            echo >&2 " * $CC using $CC_as"
+            echo >&2 " * $CXX using $CXX_as"
             echo >&2 " * \$AS equal to $AS"
             if [ "$SAGE_PORT" = "" ]; then
                 echo >&2 "Aborting, either change or unset AS or set SAGE_PORT=yes or set"
@@ -200,13 +200,13 @@ if [ $need_to_install_gcc != yes ]; then
         fi
     fi
     if [ "$LD" != "" ]; then
-        CC_ld=`$CC -print-file-name=ld 2>/dev/null`
-        CC_ld=`command -v $CC_ld 2>/dev/null`
+        CXX_ld=`$CXX -print-file-name=ld 2>/dev/null`
+        CXX_ld=`command -v $CXX_ld 2>/dev/null`
         cmd_LD=`command -v $LD`
 
-        if [ "$CC_ld" != "" -a "$CC_ld" != "$cmd_LD" ]; then
+        if [ "$CXX_ld" != "" -a "$CXX_ld" != "$cmd_LD" ]; then
             echo >&2 "Error: Mismatch of linkers between"
-            echo >&2 " * $CC using $CC_ld"
+            echo >&2 " * $CXX using $CXX_ld"
             echo >&2 " * \$LD equal to $LD"
             if [ "$SAGE_PORT" = "" ]; then
                 echo >&2 "Aborting, either change or unset LD or set SAGE_PORT=yes or set"
@@ -219,45 +219,6 @@ if [ $need_to_install_gcc != yes ]; then
     fi
 fi
 
-###############################################################################
-# Create the sage_fortran script.
-###############################################################################
-
-# Don't use FC if we are installing GCC or have
-# installed gfortran, as that can cause compatibility problems.
-# We want to use the Fortran compiler that we build as part of GCC.
-if [ "$need_to_install_gcc" = yes ] || [ -x "$SAGE_LOCAL/bin/gfortran" ]; then
-    unset FC
-fi
-
-# Write sage_fortran script.
-cat >"$SAGE_LOCAL/bin/sage_fortran" <<EOF
-#!/bin/sh
-
-cat >&2 <<ENDOFWARNING
-WARNING: The sage_fortran script is deprecated since Sage 5.11 and
-might not be supported in future versions of Sage. You should update
-your package to use the standard environment variable \\\$FC instead.
-
-ENDOFWARNING
-
-if [ "x\$FC" = x ]; then
-    # Default value determined in build/install
-    myFC='${FC:-gfortran}'
-else
-    myFC="\$FC"
-fi
-
-# unset FC to avoid an infinite loop in the case that FC=sage_fortran.
-unset FC
-
-if [ "\$SAGE64" = yes ]; then
-    exec \$myFC -m64 -fPIC "\$@"
-else
-    exec \$myFC -fPIC "\$@"
-fi
-EOF
-chmod +x "$SAGE_LOCAL/bin/sage_fortran"
 
 ###############################################################################
 # Create $SAGE_ROOT/build/Makefile starting from build/deps