diff options
| author | Jennifer Green <jgreen@lanl.gov> | 2020-05-05 12:02:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-05 14:02:49 -0400 |
| commit | de71b2828f1813e7cb4b1ae556aee0a78850a3e1 (patch) | |
| tree | 498a532cbe08d57d20d40a2e3688f2ef99487864 | |
| parent | ff3769e2e2db7d0b6e2620ff78fdefa9f0386ed9 (diff) | |
| download | spack-de71b2828f1813e7cb4b1ae556aee0a78850a3e1.tar.gz spack-de71b2828f1813e7cb4b1ae556aee0a78850a3e1.tar.bz2 spack-de71b2828f1813e7cb4b1ae556aee0a78850a3e1.tar.xz spack-de71b2828f1813e7cb4b1ae556aee0a78850a3e1.zip | |
CMake: Cray XC40 system errors bootstrapping CMake (#16459)
* CMake: fix https://github.com/spack/spack/issues/16453 with a patch addressing both libhugetlbfs and icpc warnings on Cray XC40 systems
* Including CMake v3.17.2 in the patched versions
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/ignore_crayxc_warnings.patch | 11 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cmake/package.py | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/ignore_crayxc_warnings.patch b/var/spack/repos/builtin/packages/cmake/ignore_crayxc_warnings.patch new file mode 100644 index 0000000000..85928f0e84 --- /dev/null +++ b/var/spack/repos/builtin/packages/cmake/ignore_crayxc_warnings.patch @@ -0,0 +1,11 @@ +diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake +index fb68ed78c9..c6c1ba667f 100644 +--- a/Source/Checks/cm_cxx_features.cmake ++++ b/Source/Checks/cm_cxx_features.cmake +@@ -17,2 +17,6 @@ function(cm_check_cxx_feature name) + set(check_output "${OUTPUT}") ++ # Filter out libhugetlbfs warnings ++ string(REGEX REPLACE "[^\n]*libhugetlbfs [^\n]*: WARNING[^\n]*" "" check_output "${check_output}") ++ # Filter out icpc warnings ++ string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}") + # Filter out MSBuild output that looks like a warning. diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 833573bf80..acf5b1fcdc 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -132,6 +132,11 @@ class Cmake(Package): # https://gitlab.kitware.com/cmake/cmake/issues/18232 patch('nag-response-files.patch', when='@3.7:3.12') + # Cray libhugetlbfs and icpc warnings failing CXX tests + # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4698 + # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/4681 + patch('ignore_crayxc_warnings.patch', when='@3.7:3.17.2') + conflicts('+qt', when='^qt@5.4.0') # qt-5.4.0 has broken CMake modules # https://gitlab.kitware.com/cmake/cmake/issues/18166 |