diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch index 710720b5c5..034cac069b 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler3.patch @@ -1,13 +1,13 @@ -diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutils/fcompiler/fj.py ---- spack-src.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 -+++ spack-src/numpy/distutils/fcompiler/fj.py 2020-11-16 18:30:06.698641953 +0900 -@@ -0,0 +1,38 @@ +diff -urN spack-src.org/numpy/distutils/fcompiler/fujitsu.py spack-src/numpy/distutils/fcompiler/fujitsu.py +--- spack-src.org/numpy/distutils/fcompiler/fujitsu.py 1970-01-01 09:00:00.000000000 +0900 ++++ spack-src/numpy/distutils/fcompiler/fujitsu.py 2020-11-16 18:30:06.698641953 +0900 +@@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + -+compilers = ['FJFCompiler'] ++compilers = ['FujitsuFCompiler'] + -+class FJFCompiler(FCompiler): -+ compiler_type = 'fj' ++class FujitsuFCompiler(FCompiler): ++ compiler_type = 'fujitsu' + description = 'Fujitsu Fortran Compiler' + + possible_executables = ['frt'] @@ -34,12 +34,14 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutil + return ['-g'] + def runtime_library_dir_option(self, dir): + return '-Wl,-rpath=%s' %dir ++ def get_libraries(self): ++ return ['fj90f', 'fj90i', 'fjsrcinfo'] + +if __name__ == '__main__': + from distutils import log + from numpy.distutils import customized_fcompiler + log.set_verbosity(2) -+ print(customized_fcompiler('fj').get_version()) ++ print(customized_fcompiler('fujitsu').get_version()) diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/distutils/fcompiler/__init__.py --- spack-src.org/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:25:26.087294181 +0900 +++ spack-src/numpy/distutils/fcompiler/__init__.py 2020-11-16 18:26:19.987553070 +0900 @@ -48,7 +50,7 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/__init__.py spack-src/numpy/di ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')), ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq', - 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')), -+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fj')), ++ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fujitsu')), ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')), ('irix.*', ('mips', 'gnu', 'gnu95',)), |