Permalink
Browse files

Fix fortran args

  • Loading branch information...
1 parent 6e0a624 commit f169a284fc71307c2068e305bb0ef0a0ac702151 @mamash committed Jun 22, 2012
Showing with 20 additions and 1 deletion.
  1. +1 −1 math/py-numpy/distinfo
  2. +18 −0 math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
  3. +1 −0 math/py-scipy/Makefile
View
2 math/py-numpy/distinfo
@@ -6,4 +6,4 @@ Size (numpy-1.4.1.tar.gz) = 2201795 bytes
SHA1 (patch-aa) = 5dc5d8c1ffb2bbbb6c89656aaa6404ac01e977ed
SHA1 (patch-ab) = 18ef5b7ad8386a4e991bde9f7112ec7b13d2a39c
SHA1 (patch-numpy_distutils_fcompiler_g95.py) = a45933022149d7a6ccac5f50d66afc6038d6ed95
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 4e0c8cfd2893c050872061ce3b7fc87fda4b03ac
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 869f631a26b0b59bdf73f176b74596c9251465e5
View
18 math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
@@ -4,6 +4,24 @@
--- numpy/distutils/fcompiler/gnu.py.orig 2010-04-22 09:35:24.000000000 +0000
+++ numpy/distutils/fcompiler/gnu.py
+@@ -69,7 +69,7 @@ class GnuFCompiler(FCompiler):
+ 'compiler_f77' : [None, "-g", "-Wall", "-fno-second-underscore"],
+ 'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
+ 'compiler_fix' : None,
+- 'linker_so' : [None, "-g", "-Wall"],
++ 'linker_so' : [None, "-g", "-Wall", "-shared"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : ["ranlib"],
+ 'linker_exe' : [None, "-g", "-Wall"]
+@@ -230,7 +230,7 @@ class Gnu95FCompiler(GnuFCompiler):
+ 'compiler_f90' : [None, "-Wall", "-fno-second-underscore"] + _EXTRAFLAGS,
+ 'compiler_fix' : [None, "-Wall", "-ffixed-form",
+ "-fno-second-underscore"] + _EXTRAFLAGS,
+- 'linker_so' : ["<F90>", "-Wall"],
++ 'linker_so' : ["<F90>", "-Wall", "-shared"],
+ 'archiver' : ["ar", "-cr"],
+ 'ranlib' : ["ranlib"],
+ 'linker_exe' : [None, "-Wall"]
@@ -249,7 +249,7 @@ class Gnu95FCompiler(GnuFCompiler):
def _universal_flags(self, cmd):
View
1 math/py-scipy/Makefile
@@ -29,6 +29,7 @@ BROKEN= Requires fortran 95
.endif
CPPFLAGS+= -D__STDC_FORMAT_MACROS
+FFLAGS+= -fPIC
.include "../../lang/python/extension.mk"
.include "../../math/fftw/buildlink3.mk"

0 comments on commit f169a28

Please sign in to comment.