diff options
| author | Tom Payerle <payerle@umd.edu> | 2018-12-09 14:08:38 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-12-09 13:08:38 -0600 |
| commit | 8f0fc259c8bdcbbb7d28506f872e085b5fa8356f (patch) | |
| tree | 469e6cd6e7d2b06d6f7a416e44e5ba42cbc3a98a /var | |
| parent | f0326c0ccf8106a613d684ddb65cc4a991ddf1fa (diff) | |
| download | spack-8f0fc259c8bdcbbb7d28506f872e085b5fa8356f.tar.gz spack-8f0fc259c8bdcbbb7d28506f872e085b5fa8356f.tar.bz2 spack-8f0fc259c8bdcbbb7d28506f872e085b5fa8356f.tar.xz spack-8f0fc259c8bdcbbb7d28506f872e085b5fa8356f.zip | |
metis: Fix issues with gcc6 and misleading indentation (#10058)
Added patch to GKlibSystem.cmake to disable warnings (which get
promoted to errors) due to -Wmisleading-indentation being added
to -Wall in gcc 6
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/metis/gklib_nomisleadingindentation_warning.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/metis/package.py | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/metis/gklib_nomisleadingindentation_warning.patch b/var/spack/repos/builtin/packages/metis/gklib_nomisleadingindentation_warning.patch new file mode 100644 index 0000000000..06fb70bae0 --- /dev/null +++ b/var/spack/repos/builtin/packages/metis/gklib_nomisleadingindentation_warning.patch @@ -0,0 +1,12 @@ +diff -Naur metis-5.1.0/GKlib/GKlibSystem.cmake metis-5.1.0.patched/GKlib/GKlibSystem.cmake +--- metis-5.1.0/GKlib/GKlibSystem.cmake 2013-03-30 12:24:45.000000000 -0400 ++++ metis-5.1.0.patched/GKlib/GKlibSystem.cmake 2018-12-07 16:22:58.491427261 -0500 +@@ -33,7 +33,7 @@ + set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Wall -pedantic -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas") ++ set(GKlib_COPTIONS "${GKlib_COPTIONS} -Wall -pedantic -Wno-misleading-indentation -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99") diff --git a/var/spack/repos/builtin/packages/metis/package.py b/var/spack/repos/builtin/packages/metis/package.py index ad03293d29..c80b806d54 100644 --- a/var/spack/repos/builtin/packages/metis/package.py +++ b/var/spack/repos/builtin/packages/metis/package.py @@ -48,6 +48,7 @@ class Metis(Package): depends_on('cmake@2.8:', when='@5:', type='build') patch('install_gklib_defs_rename.patch', when='@5:') + patch('gklib_nomisleadingindentation_warning.patch', when='@5: %gcc@6:') def url_for_version(self, version): url = "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis" |