zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix xl/trilinos (#4607)

Browse Source 
* Added magma package

* Incorporated Serban's change

* fix-xl/trilinos: add -qfixed to Fortran flags in seacas package

* fix-xl/trilinos: fixed spack flake8 errors
This commit is contained in:
serbanmaerean 2017-06-27 07:40:38 -04:00 committed by Adam J. Stewart
parent 051d15f777
commit 77218b1c8d
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -197,6 +197,8 @@ class Trilinos(CMakePackage):
depends_on('swig', when='+python')
patch('umfpack_from_suitesparse.patch', when='@11.14.1:12.8.1')
patch('xlf_seacas.patch', when='@12.10.1%xl')
patch('xlf_seacas.patch', when='@12.10.1%xl_r')
def url_for_version(self, version):
url = "https://github.com/trilinos/Trilinos/archive/trilinos-release-{0}.tar.gz"

12
var/spack/repos/builtin/packages/trilinos/xlf_seacas.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/packages/seacas/cmake/FortranSettings.cmake 2017-06-26 15:28:54.660570160 -0400
+++ b/pacakges/seacas/cmake/FortranSettings.cmake 2017-06-26 15:28:05.650565259 -0400
@@ -7,7 +7,7 @@
IF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fcray-pointer -fdefault-real-8 -fdefault-integer-8 -fno-range-check")
ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "XL")
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -WF,-D__XLF__ -qintsize=8 -qrealsize=8")
+ SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qfixed -WF,-D__XLF__ -qintsize=8 -qrealsize=8")
ELSE()
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i8")
ENDIF()