netlib-scalapack: fixed compilation with gcc 10 (#17647)

This commit is contained in:
rempke 2020-07-24 16:53:32 +02:00 committed by GitHub
parent 13b3578d2f
commit 6bad79fca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 0 deletions

View file

@ -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)

View file

@ -46,6 +46,8 @@ class NetlibScalapack(CMakePackage):
patch("mpi2-compatibility.patch", when='@2.0.2:2.0.99') patch("mpi2-compatibility.patch", when='@2.0.2:2.0.99')
# See: https://github.com/Reference-ScaLAPACK/scalapack/pull/16 # See: https://github.com/Reference-ScaLAPACK/scalapack/pull/16
patch("int_overflow.patch", when='@2.0.0:2.1.0') 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 @property
def libs(self): def libs(self):