Ticket #8039: atlas-3.8.3.p12.patch

File atlas-3.8.3.p12.patch, 2.2 KB (added by jsp, 12 years ago)

Updated patch

  • SPKG.txt 

    # HG changeset patch
# User Jaap Spies <jaapspies@gmail.com>
# Date 1266873613 -3600
# Node ID c52f8d41d3c08c6d56700b4f4d884c858b3806a4
# Parent  9df12fcc1ce0fe678169b8e3ea42a159642356df
in src/lib/Make.inc change -melf_x86_64 to -64 for SunOS with $SAGE64 = yes

diff -r 9df12fcc1ce0 -r c52f8d41d3c0 SPKG.txt
    a b  
    3333
    3434== ChangeLog ==
    3535
     36=== atlas-3.8.3.p12 (Jaap Spies, Februari 22th 2010) ===
     37 * #8039 For use with the Sun ld with SAGE64="yes" change ldflag -melf_86_64 to -64
     38 * See also the remarks from David Kirky on atlas-3.8.3.p5
     39
    3640=== atlas-3.8.3.p11 (Peter Jeremy, 2010-01-25)===
    3741 * #7827: Fix atlas-3.8.3.p9 compilation on FreeBSD
    3842 * Minh Van Nguyen: patch spkg-install-script to copy

  • spkg-install-script 

    diff -r 9df12fcc1ce0 -r c52f8d41d3c0 spkg-install-script
    a b  
    8686             echo "'--no-whole-archive' will be changed to '-zdefaultextract'"
    8787             echo "A copy of the original Makefile will be copied to Makefile.orig"
    8888             cp Makefile Makefile.orig
    89              sed 's/-shared/-G/g' Makefile > makefile
    90              sed 's/-soname/-h/g' makefile > Makefile
    91              sed 's/--whole-archive/-z allextract/g' Makefile > makefile
    92              sed 's/--no-whole-archive/-z defaultextract/g' makefile > Makefile
    93              rm makefile
     89             sed 's/-shared/-G/g' Makefile > makefile.tmp
     90             sed 's/-soname/-h/g' makefile.tmp > Makefile
     91             sed 's/--whole-archive/-z allextract/g' Makefile > makefile.tmp
     92             sed 's/--no-whole-archive/-z defaultextract/g' makefile.tmp > Makefile
     93             rm makefile.tmp
     94             echo "Change ldflag -melf_x86_64 to -64 as needed for Sun ld"
     95             if [ "x$SAGE64" = xyes ]; then
     96                sed 's/-melf_x86_64/-64/g' Make.inc > makeinc
     97                mv makeinc Make.inc
     98             fi
    9499          else
    95100             echo "WARNING You are using the GNU linker from 'binutils'"
    96101             echo "Generally it is considered better to use the Sun linker"