Ticket #8010: 8010.numpy.patch

File 8010.numpy.patch, 3.2 KB (added by flawrence, 11 years ago)

  • SPKG.txt 

    # HG changeset patch
# User Felix Lawrence <felix@physics.usyd.edu.au>
# Date 1263968979 -39600
# Node ID a6b16a3723960e80bc34b84eb13905be11b41308
# Parent  849717d395b858b46df0b7af7909674553223d33
Modify Sage_FCompiler_1 so to support OS X, which does not support the linker option -shared

diff -r 849717d395b8 -r a6b16a372396 SPKG.txt
    a b  
    5959
    6060== Changelog ==
    6161
     62=== numpy-1.3.0.p2 (Felix Lawrence, 20 January 2010)===
     63 * Modify Sage_FCompiler_1 so to support OS X, which does not support "-shared"
     64
    6265=== numpy-1.3.0.p2 (Ondrej Certik, 20 September 2009) ===
    6366 * fix the build system to work in cygwin
    6467

  • patches/gnu.py 

    diff -r 849717d395b8 -r a6b16a372396 patches/gnu.py
    a b  
    345345#            break
    346346
    347347
     348    if os.uname()[0]=="Darwin":
     349        link_command=["sage_fortran","-Wall","-undefined", "dynamic_lookup", "-bundle"]
     350    else:
     351        link_command=["sage_fortran","-Wall","-shared"]
    348352
    349353    executables = {
    350354        'version_cmd'  : ["sage_fortran","--version"],
    351355        'compiler_f77' : ["sage_fortran","-Wall","-ffixed-form","-fno-second-underscore"],
    352356        'compiler_f90' : ["sage_fortran","-Wall","-fno-second-underscore"],
    353357        'compiler_fix' : ["sage_fortran","-Wall","-ffixed-form","-fno-second-underscore"],
    354         'linker_so'    : ["sage_fortran","-Wall","-shared"],
     358        'linker_so'    : link_command,
    355359        'archiver'     : ["ar", "-cr"],
    356360        'ranlib'       : ["ranlib"],
    357361        'linker_exe'   : ["sage_fortran","-Wall"]

  • patches/gnu.py.diff 

    diff -r 849717d395b8 -r a6b16a372396 patches/gnu.py.diff
    a b  
    1 --- ../src/numpy/distutils/fcompiler/gnu.py     2009-04-05 01:09:20.000000000 -0700
    2 +++ gnu.py      2009-07-08 21:13:51.000000000 -0700
     1--- ../src/numpy/distutils/fcompiler/gnu.py     2009-04-05 18:09:20.000000000 +1000
     2+++ gnu.py      2010-01-20 17:20:46.000000000 +1100
    33@@ -5,6 +5,7 @@
    44 
    55 from numpy.distutils.cpuinfo import cpu
    … …  
    2727         st, out = exec_command(" ".join(newcmd))
    2828         if st == 0:
    2929             for line in out.splitlines():
    30 @@ -318,6 +322,160 @@
     30@@ -318,6 +322,164 @@
    3131             if m:
    3232                 return m.group(1)
    3333         return ""
    … …  
    5454+#            break
    5555+
    5656+
     57+    if os.uname()[0]=="Darwin":
     58+        link_command=["sage_fortran","-Wall","-undefined", "dynamic_lookup", "-bundle"]
     59+    else:
     60+        link_command=["sage_fortran","-Wall","-shared"]
    5761+
    5862+    executables = {
    5963+        'version_cmd'  : ["sage_fortran","--version"],
    6064+        'compiler_f77' : ["sage_fortran","-Wall","-ffixed-form","-fno-second-underscore"],
    6165+        'compiler_f90' : ["sage_fortran","-Wall","-fno-second-underscore"],
    6266+        'compiler_fix' : ["sage_fortran","-Wall","-ffixed-form","-fno-second-underscore"],
    63 +        'linker_so'    : ["sage_fortran","-Wall","-shared"],
     67+        'linker_so'    : link_command,
    6468+        'archiver'     : ["ar", "-cr"],
    6569+        'ranlib'       : ["ranlib"],
    6670+        'linker_exe'   : ["sage_fortran","-Wall"]