diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/fj_flags.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/fj_flags.patch b/var/spack/repos/builtin/packages/conduit/fj_flags.patch new file mode 100644 index 0000000000..9bb50c8d5a --- /dev/null +++ b/var/spack/repos/builtin/packages/conduit/fj_flags.patch @@ -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 diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 8aae3db8b2..a830def9e3 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -85,7 +85,7 @@ class Conduit(Package): # CMake ####################### # 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 @@ -145,6 +145,10 @@ class Conduit(Package): depends_on("py-sphinx-rtd-theme", when="+python+doc", type='build') 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 phases = ["configure", "build", "install"] |