Ticket #9533: 9533-tidyup-and-resolve-flag-issues.patch

File 9533-tidyup-and-resolve-flag-issues.patch, 5.1 KB (added by drkirkby, 9 years ago)

Patch taking into account comments by reviewer, and a bit of a tidyup.

  • SPKG.txt

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1279441877 -3600
    # Node ID f5099498cdf71e37ab8c1942878d30fca4fac0d6
    # Parent  6eeeacc7cc8030dfdc4a202068b28f33e1020450
    # Added compiler options -O2 -g, as despite what the src says, these were not added. CFLAGS/CPPFLAGS are no longer overwritten. General tidy up of SPKG.txt
    
    diff -r 6eeeacc7cc80 -r f5099498cdf7 SPKG.txt
    a b  
    44
    55Website: http://www.gnu.org/software/gsl/
    66
    7 From the website above: The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers. It is free software under the GNU General Public License.
     7From the website above: The GNU Scientific Library (GSL) is a numerical
     8library for C and C++ programmers. It is free software under the GNU General
     9Public License.
    810
    9 The library provides a wide range of mathematical routines such as random number generators, special functions and least-squares fitting. There are over 1000 functions in total with an extensive test suite.
     11The library provides a wide range of mathematical routines such as random
     12number generators, special functions and least-squares fitting. There are
     13over 1000 functions in total with an extensive test suite.
    1014
    1115== License ==
    1216
    13  * GPL V3 or later (1.10 release)
    14  * GPL V2 or later (1.9 release)
     17 * GPL V3
    1518
    1619== SPKG Maintainers ==
    1720
     
    1922
    2023== Upstream Contact ==
    2124
     25 * http://www.gnu.org/software/gsl/
     26
    2227GSL mailing lists:
    2328
    24  * Bug-gsl <bug-gsl@gnu.org> mailing list -- bug reports for the GNU Scientific Library should be sent here
    25  * Help-gsl <help-gsl@gnu.org> users mailing list -- for questions about installation, how GSL works and how it is used, or general questions concerning GSL.
    26  * Info-gsl <info-gsl@gnu.org> mailing list -- announcements of new releases are made here.
     29 * Bug-gsl <bug-gsl@gnu.org> mailing list -- bug reports for the GNU
     30   Scientific Library should be sent to bug-gsl@gnu.org
     31 * Help-gsl <help-gsl@gnu.org> users mailing list -- for questions about
     32   installation, how GSL works and how it is used, or general questions
     33   concerning GSL.
     34 * Info-gsl <info-gsl@gnu.org> mailing list -- announcements of new releases
     35   are made there.
    2736
    2837== Dependencies ==
    2938
    30  * ATLAS, but it seems to be only required when actually linking the gsl extensions
     39 * ATLAS, but it seems to be only required when actually linking the gsl
     40   extensions
    3141
    3242== Changelog ==
    3343
    3444=== gsl-1.14 (David Kirkby, 17th July 2010) ===
    3545 * #9533 Update GSL to the latest upstream release - the previous
    36    version was nearly 3 years old.
     46   version (1.10) was nearly 3 years old.
     47 * Reformatted this file for 80 characters width.
    3748 * Added 'exit 1' to spkg-install so the build terminates
    3849   if 'configure' fails to run properly.
    3950 * Same as above, when running 'make'
     
    4455 * Removed patches. I doubt they are useful when they
    4556   are on a version of GSL that is nearly 3 years old.
    4657   It is better to resolve problems if found, rather than try
    47    to patch a very updated version of GSL.
    48  * Remove the compiler options -O2 -g, since GSL defaults to
    49    those options.
    50  * Used $MAKE for building, as builing in parallel seems
    51    relieable.
     58   to use patches made against a very outdated version of GSL.
     59 * Used $MAKE for building, as building in parallel is
     60   reliable.
     61 * $MAKE is also used in spkg-check for testing GSL in
     62   parallel. The GSL has been tested on around 50 builds in
     63   total on Linux, OpenSolaris, OS X and Solaris. Each time
     64   all the self-tests of GSL pass. From 2 to 1000 threads were
     65   used.
     66 * Removed reference to GPL 2 in earlier releases - it is
     67   irrelevant what licence previous releases of GSL were
     68   released under.
     69 * Removed notes about patches on OS X. GSL would appear to
     70   handle OS X properly.
    5271 
    5372=== gsl-1.10.p2 (Jaap Spies,  Jan 25th, 2010) ===
    5473 * Made SAGE64=yes work for Open Solaris 64 bit
     
    7190 * initial release
    7291
    7392== Build Notes ==
    74  * On OSX we use a slighly modified isinf method since the system one is buggy. See the patches directory for a patch
    75  * Download: ftp://mirrors.kernel.org/gnu/gsl/
     93 * None
    7694
  • spkg-install

    diff -r 6eeeacc7cc80 -r f5099498cdf7 spkg-install
    a b  
    11#!/usr/bin/env bash
    22
    3 if [ "$SAGE64" = "yes" ]; then
     3if [ "x$SAGE64" = xyes ]; then
    44   echo "Building a 64-bit version of the GNU Scientific Library (GSL)"
    5    CFLAGS="-m64 "; export CFLAGS
    6    CPPFLAGS="-m64 "; export CPPFLAGS
     5   CFLAGS="$CFLAGS -m64 "
     6   CPPFLAGS="$CPPFLAGS -m64" ; export CPPFLAGS
    77fi
    88
    9 # There is no need to add compiler options like -g -O2,
    10 # as GSL includes them.
     9CFLAGS="$CFLAGS -g -O2"
     10export CFLAGS
    1111
    1212# An error "/bin/rm: cannot remove `libtoolT': No such file or directory"
    1313# often resulted. The following web site suggests export RM to "rm -f"
    14 # http://toxpenguin.blogspot.com/2009/09/solution-for-libtoolt-error.html
     14# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523750
    1515# which solved the problem.
    1616
    1717export RM="rm -f"