Ticket #10187: 10187-cleanup.patch

File 10187-cleanup.patch, 3.7 KB (added by drkirkby, 9 years ago)

clean up SPKG.txt and spkg-install on the ECL package

  • SPKG.txt

    # HG changeset patch
    # User David Kirkby <david.kirkby@onetel.net>
    # Date 1291179490 0
    # Node ID bfdaad1ed76d4021d49bcf2881583f02b106f884
    # Parent  b196ce9a7a24a25e691e84dad836d942927bdd4a
    #10187 Cleanup of spkg-install and SPKG.txt
    
    diff -r b196ce9a7a24 -r bfdaad1ed76d SPKG.txt
    a b  
    4141 * Delete the contents of the src/msvc directory
    4242 * Delete the contents of the src/contrib/encodings/
    4343 * TODO - Add the ECL test suite, and an spkg-check file to run it.
     44 * Note, the way we configure Sage, CXX and CXXFLAGS are unused.
    4445
    4546== Changelog ==
    4647
     
    8384    upstream source code.
    8485  * Changed code to set optimisation flag -O0 if SAGE_DEBUG=yes. This
    8586    is more consistent with other packages.
     87  * Removed set -e / set +e. When used properly, these are useful, but it
     88    is very easy for someoone to fail to set them properly, that it's safter
     89    to not use them. :w
     90  * Changed method of setting CPPFLAGS and LDFLAGS so they would work with
     91    a space in $SAGE_LOCAL.
     92  * Made notes in this file and spkg-install that the way ECL is configured
     93    in Sage, the values of CXX and CXXFLAGS are ignored.
     94  * Added -with-gmp-prefix="$SAGE_LOCAL" --with-system-gmp=yes
     95    --enable-boehm=system to the line invoking the configure script. These
     96  * Removed an inaccurate comment about what MAKE="$MAKE -j1" does.
     97  * Noted that a certain bit of code would be executed on Solaris Express too,
     98    rather than just the Solaris and OpenSolaris that were listed before.
     99  * Ensured that user defined values for CFLAGS & CXXFLAGS do not get
     100    overwritten, as they would have done when SAGE_DEBUG was not "yes"
     101
    86102
    87103=== ecl-10.2.1.p3 (David Kirkby, David Kirkby, 17th September 2010) ===
    88104  * #9917 Add a missing argument on line 678 of dpp.c. The code is fixed
  • spkg-install

    diff -r b196ce9a7a24 -r bfdaad1ed76d spkg-install
    a b  
    1414   CXXFLAG64=-m64
    1515fi
    1616
    17 CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
    18 LDFLAGS="$LDFLAGS -L$SAGE_LOCAL/lib"
     17CPPFLAGS="$CPPFLAGS -I${SAGE_LOCAL}/include"
     18LDFLAGS="$LDFLAGS -L${SAGE_LOCAL}/lib"
    1919
    2020# Compile for 64-bit if SAGE64 is set to 'yes'
    2121if [ "x$SAGE64" = "xyes" ]  ; then
     
    2929   CFLAGS="$CFLAGS -g -O0"
    3030   CXXFLAGS="$CXXFLAGS -g -O0"
    3131else
    32    CFLAGS="$CFLAGS -g -O2"
    33    CXXFLAGS="$CXXFLAGS -g -O2"
     32   CFLAGS="-g -O2 $CFLAGS"
     33   CXXFLAGS="-g -O2 $CXXFLAGS"
    3434fi
    3535
    3636# These are all used by GNU to specify compilers.
     
    5555# End of pretty general spkg-install file.
    5656# Now do the specific things needed for this package (ECL)
    5757
    58 # 'export MAKE='make -j n' where n>1, breaks ECL builds, so unset make
     58# 'export MAKE='make -j n' where n>1, breaks ECL builds, so use only one thread
    5959MAKE="$MAKE -j1"
    6060 
    6161# We clear MAKEFLAGS to fix building multiple spkgs in parallel on OS X.
    6262export MAKEFLAGS=
    6363
    64 set +e
    65 
    6664cd src
    6765
    6866if [ "x`uname -sm`" = "xSunOS i86pc" ] && [ "x$SAGE64" = xyes ]  ; then
    6967   # Need to add --with-dffi=no to disable assembly code on OpenSolaris x64.
    7068   # and Solaris 10 on x64.
    7169   # The option is only given if all the following are true
    72    # 1) Solaris or OpenSolaris (SunOS)
     70   # 1) Solaris, Solaris Express or OpenSolaris (SunOS)
    7371   # 2) Intel or AMD CPU
    7472   # 3) 64-bit build
    75    ./configure --prefix="$SAGE_LOCAL" --with-dffi=no
     73   ./configure --prefix="$SAGE_LOCAL" --with-gmp-prefix="$SAGE_LOCAL" --with-system-gmp=yes --enable-boehm=system --with-dffi=no
    7674else
    77    ./configure --prefix="$SAGE_LOCAL"
     75   ./configure --prefix="$SAGE_LOCAL" --with-gmp-prefix="$SAGE_LOCAL" --with-system-gmp=yes --enable-boehm=system
    7876fi
    7977
    8078if [ $? -ne 0 ]; then