diff options
| author | ketsubouchi <kenta.tsubouchi@hac-inc.co.jp> | 2020-09-08 00:47:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 17:47:55 +0200 |
| commit | 03a808ec2d1dc58d4b428631e9b4f911dc8e7c5a (patch) | |
| tree | d054951f67792d3895be4872d8b517276fb02270 | |
| parent | 138e2ad0a1b34499dfe3fbc04f9347cf2f86ace1 (diff) | |
| download | spack-03a808ec2d1dc58d4b428631e9b4f911dc8e7c5a.tar.gz spack-03a808ec2d1dc58d4b428631e9b4f911dc8e7c5a.tar.bz2 spack-03a808ec2d1dc58d4b428631e9b4f911dc8e7c5a.tar.xz spack-03a808ec2d1dc58d4b428631e9b4f911dc8e7c5a.zip | |
kim-api: add support for Fujitsu compilers (#18533)
| -rw-r--r-- | var/spack/repos/builtin/packages/kim-api/fujitsu_add_link_flags.patch | 21 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/kim-api/package.py | 3 |
2 files changed, 24 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/kim-api/fujitsu_add_link_flags.patch b/var/spack/repos/builtin/packages/kim-api/fujitsu_add_link_flags.patch new file mode 100644 index 0000000000..3ea0672dd3 --- /dev/null +++ b/var/spack/repos/builtin/packages/kim-api/fujitsu_add_link_flags.patch @@ -0,0 +1,21 @@ +diff -u -r -N a/cmake/Modules/DefaultCompilerFlags.cmake b/cmake/Modules/DefaultCompilerFlags.cmake +--- a/cmake/Modules/DefaultCompilerFlags.cmake 2020-09-07 14:19:20.000000000 +0900 ++++ b/cmake/Modules/DefaultCompilerFlags.cmake 2020-09-07 15:29:14.000000000 +0900 +@@ -51,7 +51,7 @@ + endif() + # + # +-set(CMAKE_EXE_LINKER_FLAGS "${KIM_API_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") ++set(CMAKE_EXE_LINKER_FLAGS "--linkfortran ${KIM_API_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") + # + + # Set global compiler options +@@ -107,7 +107,7 @@ + endif() + set(KIM_API_Fortran_FLAGS "${KIM_API_Fortran_FLAGS}" CACHE STRING "KIM API Fortran compiler flags") + # +- ++set(CMAKE_Fortran_MODDIR_FLAG -M) + # Update CMAKE variables + set(CMAKE_CXX_FLAGS "${KIM_API_CXX_FLAGS} ${CMAKE_CXX_FLAGS}") + set(CMAKE_C_FLAGS "${KIM_API_C_FLAGS} ${CMAKE_C_FLAGS}") diff --git a/var/spack/repos/builtin/packages/kim-api/package.py b/var/spack/repos/builtin/packages/kim-api/package.py index 8c2e13f994..7d4af51437 100644 --- a/var/spack/repos/builtin/packages/kim-api/package.py +++ b/var/spack/repos/builtin/packages/kim-api/package.py @@ -35,3 +35,6 @@ class KimApi(CMakePackage): version('2.1.1', sha256="25c4e83c6caa83a1c4ad480b430f1926fb44813b64f548fdaedc45e310b5f6b9") version('2.1.0', sha256="d6b154b31b288ec0a5643db176950ed71f1ca83a146af210a1d5d01cce8ce958") version('2.0.2', sha256="26e7cf91066692f316b8ba1548ccb7152bf56aad75902bce2338cff53e74e63d") + # The Fujitsu compiler requires the '--linkfortran' + # option to combine C++ and Fortran programs. + patch('fujitsu_add_link_flags.patch', when='%fj') |