summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py2
-rw-r--r--var/spack/repos/builtin/packages/trilinos/xlf_seacas.patch12
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index 5012683879..161b2ed52a 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -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"
diff --git a/var/spack/repos/builtin/packages/trilinos/xlf_seacas.patch b/var/spack/repos/builtin/packages/trilinos/xlf_seacas.patch
new file mode 100644
index 0000000000..04e84d93fb
--- /dev/null
+++ b/var/spack/repos/builtin/packages/trilinos/xlf_seacas.patch
@@ -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()
+