diff options
| author | rempke <56254913+rempke@users.noreply.github.com> | 2020-07-24 16:53:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 16:53:32 +0200 |
| commit | 6bad79fca0e0ea321aa0c42512f967976468a492 (patch) | |
| tree | 4292f132ed386da177707e23b03c85cf7bd73669 /var | |
| parent | 13b3578d2f9d296475da8dffe097b8ae68516422 (diff) | |
| download | spack-6bad79fca0e0ea321aa0c42512f967976468a492.tar.gz spack-6bad79fca0e0ea321aa0c42512f967976468a492.tar.bz2 spack-6bad79fca0e0ea321aa0c42512f967976468a492.tar.xz spack-6bad79fca0e0ea321aa0c42512f967976468a492.zip | |
netlib-scalapack: fixed compilation with gcc 10 (#17647)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/netlib-scalapack/gcc10-compatibility.patch | 33 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/netlib-scalapack/package.py | 2 |
2 files changed, 35 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/gcc10-compatibility.patch b/var/spack/repos/builtin/packages/netlib-scalapack/gcc10-compatibility.patch new file mode 100644 index 0000000000..d852742d12 --- /dev/null +++ b/var/spack/repos/builtin/packages/netlib-scalapack/gcc10-compatibility.patch @@ -0,0 +1,33 @@ +From 6dff04cc6f5ad2c35e76dec18b7eec86943a3ed1 Mon Sep 17 00:00:00 2001 +From: DesWurstes <DesWurstes@users.noreply.github.com> +Date: Fri, 15 May 2020 15:54:14 +0100 +Subject: [PATCH] Set -fallow-argument-mismatch + +--- + CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 638dbdc..93fc34b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,9 @@ if (UNIX) + if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel") + set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fltconsistency -fp_port" ) + endif () ++ if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10) ++ set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch" ) ++ endif() + endif () + + # +@@ -79,6 +82,9 @@ if (UNIX) + if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Intel") + set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fltconsistency -fp_port" ) + endif () ++ if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10) ++ set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch" ) ++ endif() + endif () + + macro(SCALAPACK_install_library lib) diff --git a/var/spack/repos/builtin/packages/netlib-scalapack/package.py b/var/spack/repos/builtin/packages/netlib-scalapack/package.py index 26fe53190a..64381c5b28 100644 --- a/var/spack/repos/builtin/packages/netlib-scalapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-scalapack/package.py @@ -46,6 +46,8 @@ class NetlibScalapack(CMakePackage): patch("mpi2-compatibility.patch", when='@2.0.2:2.0.99') # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/16 patch("int_overflow.patch", when='@2.0.0:2.1.0') + # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/23 + patch("gcc10-compatibility.patch", when='@2.0.0:2.1.0') @property def libs(self): |