diff options
| author | Diane Bruce <db@FreeBSD.org> | 2007-09-02 20:03:45 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2007-09-02 20:03:45 +0000 |
| commit | 47e4e30358472376731559136fa9b8f16dfe3923 (patch) | |
| tree | aeaa123554c4e461347f84e7248320b2e3788d32 /math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py | |
| parent | Update to 138 (diff) | |
- I added -fPIC to compile_switch to work around build of fftpack in scipy
on amd64.
A better fix would be to set pic_flags instead, and have scipy build a
shared object for dfftpack instead a static archive, but I didn't figure
out how. [1]
- Pass maintainership to llwang@infor.org
PR: ports/112429 [1]
Submitted by: Li-Lun "Leland" Wang <llwang@infor.org> (new maintainer)
Notes
Notes:
svn path=/head/; revision=198663
Diffstat (limited to '')
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py index c79698892e7a..491a3afa4fcf 100644 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py +++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py @@ -1,15 +1,6 @@ ---- numpy/distutils/fcompiler/gnu.py.orig Mon Mar 26 14:27:13 2007 -+++ numpy/distutils/fcompiler/gnu.py Mon Jun 11 11:55:16 2007 -@@ -21,7 +21,7 @@ - # GNU Fortran 0.5.25 20010319 (prerelease) - # Redhat: GNU Fortran (GCC 3.2.2 20030222 (Red Hat Linux 3.2.2-5)) 3.2.2 20030222 (Red Hat Linux 3.2.2-5) - -- for fc_exe in map(find_executable,['g77','f77']): -+ for fc_exe in map(find_executable,['gfortran', 'gfortran42', 'g77','f77']): - if os.path.isfile(fc_exe): - break - executables = { -@@ -47,7 +47,7 @@ +--- numpy/distutils/fcompiler/gnu.py.orig 2007-08-20 21:00:55.000000000 -0500 ++++ numpy/distutils/fcompiler/gnu.py 2007-08-27 15:12:10.000000000 -0500 +@@ -67,12 +67,12 @@ for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: executables[key].append('-mno-cygwin') @@ -18,12 +9,18 @@ suggested_f90_compiler = 'gnu95' -@@ -258,7 +258,7 @@ - # GNU Fortran 95 (GCC) 4.2.0 20060218 (experimental) - # GNU Fortran (GCC) 4.3.0 20070316 (experimental) + def find_executables(self): +- for fc_exe in [find_executable(c) for c in ['g77','f77']]: ++ for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'g77','f77']]: + if os.path.isfile(fc_exe): + break + for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: +@@ -318,7 +318,7 @@ + g2c = 'gfortran' -- for fc_exe in map(find_executable,['gfortran','f95']): -+ for fc_exe in map(find_executable,['gfortran','gfortran42','f95']): - if os.path.isfile(fc_exe): - break - executables = { + def find_executables(self): +- for fc_exe in [find_executable(c) for c in ['gfortran','f95']]: ++ for fc_exe in [find_executable(c) for c in ['gfortran', 'gfortran42', 'f95']]: + if os.path.isfile(fc_exe): + break + for key in ['version_cmd', 'compiler_f77', 'compiler_f90', |