diff options
| author | ketsubouchi <kenta.tsubouchi@hac-inc.co.jp> | 2020-12-02 21:45:03 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 13:45:03 +0100 |
| commit | d9ccce96896a6ddba92129be66982781e4f9f3df (patch) | |
| tree | 1644cf1ce88a3e1ff6386b463e71dd0cb905bfaf | |
| parent | 44c1beaf3a682c42b08e0a3f562d9c26bea3f1ff (diff) | |
| download | spack-d9ccce96896a6ddba92129be66982781e4f9f3df.tar.gz spack-d9ccce96896a6ddba92129be66982781e4f9f3df.tar.bz2 spack-d9ccce96896a6ddba92129be66982781e4f9f3df.tar.xz spack-d9ccce96896a6ddba92129be66982781e4f9f3df.zip | |
py-numpy: add fj Fortran library options (#20210)
4 files changed, 12 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch index 75ae8cb93a..7f1943e8cb 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler.patch @@ -1,7 +1,7 @@ diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py numpy-1.19.4/numpy/distutils/fcompiler/fj.py --- numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py 1970-01-01 09:00:00.000000000 +0900 +++ numpy-1.19.4/numpy/distutils/fcompiler/fj.py 2020-11-10 17:21:43.324928283 +0900 -@@ -0,0 +1,38 @@ +@@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + +compilers = ['FJFCompiler'] @@ -34,6 +34,8 @@ diff -urN numpy-1.19.4.org/numpy/distutils/fcompiler/fj.py numpy-1.19.4/numpy/di + return ['-g'] + def runtime_library_dir_option(self, dir): + return f'-Wl,-rpath={dir}' ++ def get_libraries(self): ++ return ['fj90f', 'fj90i', 'fjsrcinfo'] + +if __name__ == '__main__': + from distutils import log diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch index 6e605cb137..e69cc5839b 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler2.patch @@ -1,7 +1,7 @@ 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 17:55:57.608802456 +0900 -@@ -0,0 +1,38 @@ +@@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + +compilers = ['FJFCompiler'] @@ -34,6 +34,8 @@ diff -urN spack-src.org/numpy/distutils/fcompiler/fj.py spack-src/numpy/distutil + return ['-g'] + def runtime_library_dir_option(self, dir): + return f'-Wl,-rpath={dir}' ++ def get_libraries(self): ++ return ['fj90f', 'fj90i', 'fjsrcinfo'] + +if __name__ == '__main__': + from distutils import log 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..213cd32add 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,7 +1,7 @@ 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 @@ +@@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + +compilers = ['FJFCompiler'] @@ -34,6 +34,8 @@ 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 diff --git a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch index 9b8d56c8d5..b4acdb5c84 100644 --- a/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch +++ b/var/spack/repos/builtin/packages/py-numpy/add_fj_compiler4.patch @@ -1,7 +1,7 @@ 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:42:47.672297372 +0900 -@@ -0,0 +1,38 @@ +@@ -0,0 +1,40 @@ +from numpy.distutils.fcompiler import FCompiler + +compilers = ['FJFCompiler'] @@ -34,6 +34,8 @@ 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 |