Ticket #7761: python-2.6.4.p6.patch

File python-2.6.4.p6.patch, 1.9 KB (added by jsp, 10 years ago)
  • SPKG.txt

    # HG changeset patch
    # User Jaap Spies <jaapspies@gmail.com>
    # Date 1266933854 -3600
    # Node ID 0353690e3372a69761f67f35091fe8a551674a51
    # Parent  250c886ff0d3c78af87a737bb8d7182c6a441875
    Let python build on Open Solaris x64 as 64 bit
    
    diff -r 250c886ff0d3 -r 0353690e3372 SPKG.txt
    a b  
    6464
    6565== Changelog ==
    6666
     67=== python-2.6.4.p6 (Jaap Spies, Feb 23, 2010) ===
     68 * #7761 Fix build in Open Solaris x64 with SAGE64=yes
     69
    6770=== python-2.6.4.p5 (William Stein, Jan 20, 2010) ===
    6871* Fix bug on Itanium introduced by typo by Craig in #60.  See trac 8020.
    6972
  • spkg-install

    diff -r 250c886ff0d3 -r 0353690e3372 spkg-install
    a b  
    105105    rm -f "$SAGE_LOCAL"/lib/libpython*
    106106
    107107    if [ `uname` = "Darwin" ]; then
    108         if [ "$SAGE64" = "yes" ]; then
     108        if [ "x$SAGE64" = xyes ]; then
    109109            echo "64 bit OSX build enabled"
    110110            OPT="-g -O3 -m64 -Wall -Wstrict-prototypes"; export OPT
    111111            ./configure $EXTRAFLAGS --prefix="$SAGE_LOCAL" --without-libpng \
     
    114114            ./configure $EXTRAFLAGS --prefix="$SAGE_LOCAL" --without-libpng \
    115115            --enable-unicode=ucs4 --disable-toolbox-glue
    116116        fi
     117    elif [ `uname` = "SunOS" ]; then
     118        if [ "x$SAGE64" = xyes ]; then
     119            echo "64 bit Open Solaris build enabled"
     120            OPT="-g -O3 -Wall -Wstrict-prototypes"; export OPT
     121            ./configure $EXTRAFLAGS --prefix="$SAGE_LOCAL" --without-libpng \
     122            --enable-unicode=ucs4 --with-gcc="gcc -m64"
     123        else
     124            ./configure $EXTRAFLAGS --prefix="$SAGE_LOCAL" --without-libpng \
     125            --enable-unicode=ucs4
     126        fi
    117127    else
    118128        ./configure $EXTRAFLAGS --prefix="$SAGE_LOCAL" --without-libpng --enable-unicode=ucs4 CC="$CC $CFLAGS" CXX="$CXX $CXXFLAGS"
    119129    fi