Ticket #9533: 9533-resolve-CFLAG64-and-SAGE_ROOT-issues.patch

File 9533-resolve-CFLAG64-and-SAGE_ROOT-issues.patch, 4.0 KB (added by drkirkby, 9 years ago)

Put quotes around CFLAG64 and SPKG_ROOT and update SPKG.txt to reflect discoveries about ATLAS

  • SPKG.txt

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1279708404 -3600
    # Node ID c6a71f9895d305a61ae0fcd2ed9c1c90cb68ab8e
    # Parent  547433ef2063bdfc2c63f422af9c4f12f8550bda
    #9533 Add quotes around CFLAG64 and SPKG_ROOT, and make some minor changes to SPKG.txt
    
    diff -r 547433ef2063 -r c6a71f9895d3 SPKG.txt
    a b  
    3838
    3939== Dependencies ==
    4040
    41  * None - GSL does currently not depend on any other Sage package to
    42    compile, link and pass all GSL's self-tests. However, as of
    43    20th July 2010, ATLAS is listed as a dependency in spkg/standard/deps.
     41 * None - GSL 1.14 does not depend on any other Sage package to compile,
     42   link and pass all of GSL's self-tests. Despite that fact, as of
     43   21st July 2010, ATLAS is listed as a dependency in spkg/standard/deps.
     44   (It comes with its own CBLAS implementation that is e.g. used when running
     45   the GSL test suite during installation; however, the Sage library only
     46   uses it as a fall-back, if e.g. ATLAS's CBLAS library is not present.)
    4447   
    4548== Special Update/Build Instructions ==
    46  * According to the GSL web page: http://www.gnu.org/software/gsl/
    47    "GSL requires a BLAS library for vector and matrix operations. The
    48    default CBLAS library supplied with GSL can be replaced by the tuned
    49    ATLAS library for better performance". Exactly how one would use ATLAS is
    50    not clear (there are no obvious options for the 'configure' script),
    51    but in principle it could be done.
     49 * Currently, nothing special to be done.
    5250
    5351== Changelog ==
    5452
    55 === gsl-1.14 (David Kirkby, 20th July 2010) ===
     53=== gsl-1.14 (David Kirkby, 21st July 2010) ===
    5654 * #9533 Update GSL to the latest upstream release - the previous
    5755   version (1.10) was nearly 3 years old.
    5856 * Reformatted this file for 80 characters width.
     
    8280   released under.
    8381 * Removed notes about patches on OS X. GSL would appear to
    8482   handle OS X properly.
    85  * Added the "Special Update/Build Instructions" section from SPKG.txt which
    86    was previously missing.
     83 * Added the "Special Update/Build Instructions" section to SPKG.txt which
     84   was previously missing, though currently no special steps are required.
    8785 * Added notes to SPKG.txt about an unnecessary ATLAS dependency in
    88    $SAGE_ROOT/spkg/standard/deps
     86   $SAGE_ROOT/spkg/standard/deps, and an explanation why GSL does *not*
     87   depend on ATLAS.
    8988 * Added notes to SPKG.txt about how ATLAS could in principle be used to
    9089   improve the performance of some of GSL's functionality.
    91  * Force GSL to be build with no optimisation if SAGE_DEBUG is set to "yes"
     90 * Force GSL to be built with no optimisation if SAGE_DEBUG is set to "yes"
    9291 * Check that $SAGE_ROOT is defined both in spkg-install and spkg-check.
    9392 * Exported LDFLAGS and CPPFLAGS when SAGE64 is set to "yes". This environment
    9493   variable would be set to "yes" to create 64-bit binaries on platforms
  • spkg-check

    diff -r 547433ef2063 -r c6a71f9895d3 spkg-check
    a b  
    11#!/usr/bin/env bash
    22
    3 if [ -z $SAGE_LOCAL ] ; then
     3if [ -z "$SAGE_LOCAL" ] ; then
    44   echo "SAGE_LOCAL undefined ... exiting";
    55   echo "Maybe run 'sage -sh'?"
    66   exit 1
     
    1111# default this will be -m64. IBM's compiler on AIX
    1212# and HP's on HP-UX do NOT use -m64. 
    1313
    14 if [ -z $CFLAG64 ] ; then
     14if [ -z "$CFLAG64" ] ; then
    1515   CFLAG64=-m64
    1616fi
    1717
  • spkg-install

    diff -r 547433ef2063 -r c6a71f9895d3 spkg-install
    a b  
    11#!/usr/bin/env bash
    22
    3 if [ -z $SAGE_LOCAL ] ; then
     3if [ -z "$SAGE_LOCAL" ] ; then
    44   echo "SAGE_LOCAL undefined ... exiting";
    55   echo "Maybe run 'sage -sh'?"
    66   exit 1
     
    1111# default this will be -m64. IBM's compiler on AIX
    1212# and HP's on HP-UX do NOT use -m64. 
    1313
    14 if [ -z $CFLAG64 ] ; then
     14if [ -z "$CFLAG64" ] ; then
    1515   CFLAG64=-m64
    1616fi
    1717