Ticket #11081: 11081-minor-changes.patch

File 11081-minor-changes.patch, 3.4 KB (added by drkirkby, 10 years ago)

To be applied after the two earlier patches

  • doc/en/installation/source.rst

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1301957149 -3600
    # Node ID 207e437fecab99e5468e043dde7fcc6b7f8e08b0
    # Parent  b209299d7bde80999b373971fc3bc1e7f9240c3d
    #11081 Correct typos, add a comment to update the date, and minor fixes.
    
    diff -r b209299d7bde -r 207e437fecab doc/en/installation/source.rst
    a b  
     1.. comment:
     2   ****************************
     3   If you alter this document, please change the last line ("This page
     4   was last updated on ...")
     5   ****************************
     6
    17Install from Source Code
    28========================
    39
     
    5359       latex      (Highly recommended, though not strictly required)
    5460
    5561The programs ``gcc``, ``g++`` and ``gfortran`` are all part of the `GNU Compiler Collection (GCC) <http://gcc.gnu.org/>`_.
    56 To check if you have ``m4`` installed, for example, type ``command -v m4``
     62To check if you have ``m4`` installed, for example, type
     63
     64::
     65
     66       command -v m4
     67
     68
    5769on the command line. If it gives an error (or returns nothing), then
    5870either ``m4`` is not installed, or it is installed but not in your
    5971`PATH <http://en.wikipedia.org/wiki/PATH_%28variable%29>`_
     
    7587`Binutils <http://www.gnu.org/software/binutils/>`_ package.
    7688Assuming you have sufficient privileges,
    7789you can install the ``binutils`` and other necessary components. If you
    78 do not have the privilegesto do this, ask your system
     90do not have the privileges to do this, ask your system
    7991administrator to do this, or build the components from source
    8092code. The method of installing additional software varies from
    8193distribution to distribution
     
    107119at ``/usr/sfw/bin/gmake`` but you will need to copy it somewhere else
    108120and rename it to ``make``. The same is true for GNU ``tar`` - there is a version
    109121called ``gtar`` in ``/usr/sfw/bin`` but it will need to be copied somewhere
    110 else and renamed to ``tar``.
     122else and renamed to ``tar``).
    111123
    112124For Solaris, it is recommended you create a directory ``$HOME/bins-for-sage`` and
    113125put the GNU versions of ``tar`` and ``make`` in that directory. Then ensure that
     
    205217:envvar:`SAGE_FORTRAN_LIB` must point to the 32-bit library if you are
    206218building Sage in 32-bit. Also, :envvar:`SAGE_FORTRAN_LIB` must point to a
    20721964-bit library if you are building Sage in 64-bit. For example, on
    208 Solaris both of the variables :envvar:`SAGE_FORTRAN` and
    209 :envvar:`SAGE_FORTRAN_LIB` could be set as follows::
     220Solaris & OpenSolaris, the variables :envvar:`SAGE_FORTRAN`, 
     221:envvar:`SAGE_FORTRAN_LIB` and :envvar:`SAGE64` could be set as follows::
    210222
    211     # SPARC and x86
     223    # SPARC, x86 and x64.
    212224    SAGE_FORTRAN=/path/to/gcc/install/directory/bin/gfortran
    213225
    214226    # 32-bit SPARC
    215227    SAGE_FORTRAN_LIB=/path/to/gcc/install/directory/lib/libgfortran.so
    216228
    217     # 64-bit SPARC
     229    # 64-bit SPARC 
    218230    SAGE_FORTRAN_LIB=/path/to/gcc/install/directory/lib/sparcv9/libgfortran.so
     231    SAGE64=yes
    219232
    220233    # 32-bit x86
    221234    SAGE_FORTRAN_LIB=/path/to/gcc/install/directory/lib/libgfortran.so
    222235
    223     # 64-bit x64
     236    # 64-bit x64 
    224237    SAGE_FORTRAN_LIB=/path/to/gcc/install/directory/lib/amd64/libgfortran.so
     238    SAGE64=yes
    225239
    226240(It should be noted that Sage is not supported on AIX or HP-UX, although some
    227241efforts have been made to `port Sage to AIX <http://wiki.sagemath.org/AIX>`_ and