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

conduit: added patch to build with Fujitsu compilers (#18284)

Browse Source
This commit is contained in:
ketsubouchi 2020-08-27 01:55:09 +09:00 committed by GitHub
parent f7d156af05
commit 02dc84a2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/conduit/fj_flags.patch Normal file
View File

@ -0,0 +1,14 @@
diff -u -r -N a/src/blt/cmake/SetupCompilerOptions.cmake b/src/blt/cmake/SetupCompilerOptions.cmake
--- a/src/blt/cmake/SetupCompilerOptions.cmake 2020-08-26 11:58:24.000000000 +0900
+++ b/src/blt/cmake/SetupCompilerOptions.cmake 2020-08-26 13:31:04.000000000 +0900
@@ -206,7 +206,9 @@
endif()
-
+set(CMAKE_Fortran_MODDIR_FLAG -M)
+set(CMAKE_Fortran_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "--linkfortran")
################################
# RPath Settings

6
var/spack/repos/builtin/packages/conduit/package.py
View File

@ -85,7 +85,7 @@ class Conduit(Package):
# CMake # CMake
####################### #######################
# cmake 3.8.2 or newer # cmake 3.8.2 or newer
depends_on("cmake@3.8.2:3.17.9999", type='build') depends_on("cmake@3.8.2:", type='build')
####################### #######################
# Python # Python
@ -145,6 +145,10 @@ class Conduit(Package):
depends_on("py-sphinx-rtd-theme", when="+python+doc", type='build') depends_on("py-sphinx-rtd-theme", when="+python+doc", type='build')
depends_on("doxygen", when="+doc+doxygen") depends_on("doxygen", when="+doc+doxygen")
# Tentative patch for fj compiler
# Cmake will support fj compiler and this patch will be removed
patch('fj_flags.patch', when='%fj')
# build phases used by this package # build phases used by this package
phases = ["configure", "build", "install"] phases = ["configure", "build", "install"]