diff options
| author | Sergey Kosukhin <skosukhin@gmail.com> | 2018-08-02 18:17:15 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-08-02 11:17:15 -0500 |
| commit | ec174dae69e3e2722c767d0ff03175376b0e4b2a (patch) | |
| tree | 1780938d8336da52d79b372a66bfa5749b13c5a7 /var | |
| parent | 4a6a19be855fe682f9e8fd0945f9ddccce4f3716 (diff) | |
| download | spack-ec174dae69e3e2722c767d0ff03175376b0e4b2a.tar.gz spack-ec174dae69e3e2722c767d0ff03175376b0e4b2a.tar.bz2 spack-ec174dae69e3e2722c767d0ff03175376b0e4b2a.tar.xz spack-ec174dae69e3e2722c767d0ff03175376b0e4b2a.zip | |
CMake: patch for NAG. (#8869)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/nag-response-files.patch | 9 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/nag-response-files.patch b/var/spack/repos/builtin/packages/cmake/nag-response-files.patch new file mode 100644 index 0000000000..07dc4a1aa1 --- /dev/null +++ b/var/spack/repos/builtin/packages/cmake/nag-response-files.patch @@ -0,0 +1,9 @@ +diff --git a/Modules/Compiler/NAG-Fortran.cmake b/Modules/Compiler/NAG-Fortran.cmake +index 39aae1883..9973febc3 100644 +--- a/Modules/Compiler/NAG-Fortran.cmake ++++ b/Modules/Compiler/NAG-Fortran.cmake +@@ -34,3 +34,4 @@ set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed") + set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free") + set(CMAKE_Fortran_COMPILE_OPTIONS_PIC "-PIC") + set(CMAKE_Fortran_COMPILE_OPTIONS_PIE "-PIC") ++set(CMAKE_Fortran_RESPONSE_FILE_LINK_FLAG "-Wl,@") diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 4e0460544d..8090a1b992 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -87,6 +87,9 @@ class Cmake(Package): # https://gitlab.kitware.com/cmake/cmake/issues/16226 patch('intel-c-gnu11.patch', when='@3.6.0:3.6.1') + # https://gitlab.kitware.com/cmake/cmake/issues/18232 + patch('nag-response-files.patch', when='@3.7:3.12') + conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules # https://gitlab.kitware.com/cmake/cmake/issues/18166 |