diff options
| author | Diane Bruce <db@FreeBSD.org> | 2007-06-25 16:33:24 +0000 |
|---|---|---|
| committer | Diane Bruce <db@FreeBSD.org> | 2007-06-25 16:33:24 +0000 |
| commit | 54b8f548872845231f2d91e2c97f40731b2d2ada (patch) | |
| tree | 01bd8b0c40dfd7c0e0a85a58fc9203e486227384 /math/py-numpy/files | |
| parent | - Fix my email on Whom: line (diff) | |
- Forgotten files for 1.0.2 commit
Approved by: ehaupt (mentor)
Notes
Notes:
svn path=/head/; revision=194235
Diffstat (limited to 'math/py-numpy/files')
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py | 23 | ||||
| -rw-r--r-- | math/py-numpy/files/patch-numpy_f2py_setup.py | 6 | ||||
| -rw-r--r-- | math/py-numpy/files/site.cfg | 4 |
3 files changed, 21 insertions, 12 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 db87e27b91ac..c79698892e7a 100644 --- a/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py +++ b/math/py-numpy/files/patch-numpy-distutils-fcompiler-gnu.py @@ -1,20 +1,29 @@ ---- numpy/distutils/fcompiler/gnu.py.orig Mon Oct 9 03:46:59 2006 -+++ numpy/distutils/fcompiler/gnu.py Thu Jan 25 21:48:15 2007 -@@ -22,7 +22,7 @@ +--- 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', 'gfortran41', 'gfortran42', 'g77','f77']): ++ for fc_exe in map(find_executable,['gfortran', 'gfortran42', 'g77','f77']): if os.path.isfile(fc_exe): break executables = { -@@ -247,7 +247,7 @@ - # OS X: GNU Fortran 95 (GCC) 4.1.0 +@@ -47,7 +47,7 @@ + for key in ['version_cmd', 'compiler_f77', 'linker_so', 'linker_exe']: + executables[key].append('-mno-cygwin') + +- g2c = 'g2c' ++ g2c = 'gfortran' + + 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) - for fc_exe in map(find_executable,['gfortran','f95']): -+ for fc_exe in map(find_executable,['gfortran','gfortran41','gfortran42','gfortran43','f95']): ++ for fc_exe in map(find_executable,['gfortran','gfortran42','f95']): if os.path.isfile(fc_exe): break executables = { diff --git a/math/py-numpy/files/patch-numpy_f2py_setup.py b/math/py-numpy/files/patch-numpy_f2py_setup.py index 6398aceafa91..aa12daf506c1 100644 --- a/math/py-numpy/files/patch-numpy_f2py_setup.py +++ b/math/py-numpy/files/patch-numpy_f2py_setup.py @@ -1,6 +1,6 @@ ---- numpy/f2py/setup.py.orig Wed Jul 26 16:04:20 2006 -+++ numpy/f2py/setup.py Sat Nov 18 17:13:33 2006 -@@ -32,14 +32,13 @@ +--- numpy/f2py/setup.py.orig Mon Oct 2 17:08:55 2006 ++++ numpy/f2py/setup.py Mon Jun 11 12:17:13 2007 +@@ -34,14 +34,13 @@ config.add_data_dir('docs') config.add_data_files('src/fortranobject.c', diff --git a/math/py-numpy/files/site.cfg b/math/py-numpy/files/site.cfg index 2988e7f30aee..5c9f1cb29902 100644 --- a/math/py-numpy/files/site.cfg +++ b/math/py-numpy/files/site.cfg @@ -1,10 +1,10 @@ [DEFAULT] lapack_type=atlas library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%% -include_dirs = /usr/include:%%LOCALBASE/include +include_dirs = /usr/include:%%LOCALBASE%%/include src_dirs = %%LOCALBASE%%/src # search static libraries (.a) in preference to shared ones (.so) search_static_first = 0 [atlas] -library_dirs = %%LOCALBASE%%, %%GCCLIBDIR%% +library_dirs = %%LOCALBASE%%:%%GCCLIBDIR%% atlas_libs = %%ATLASLIBS%% |