summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Wittenburg <scott.wittenburg@kitware.com>2020-11-24 08:07:34 -0700
committerGitHub <noreply@github.com>2020-11-24 07:07:34 -0800
commit348cbe143ca6f3a4f4cb21fb80da81f1bbec5e87 (patch)
tree236ff0b6fc77b2e1674146f0dcc2ccbe5db3c42d
parent87689f7cc8664332a1086662ac47d19e6e15c9f1 (diff)
downloadspack-348cbe143ca6f3a4f4cb21fb80da81f1bbec5e87.tar.gz
spack-348cbe143ca6f3a4f4cb21fb80da81f1bbec5e87.tar.bz2
spack-348cbe143ca6f3a4f4cb21fb80da81f1bbec5e87.tar.xz
spack-348cbe143ca6f3a4f4cb21fb80da81f1bbec5e87.zip
phist needs sbang fix for build script (#20063)
-rw-r--r--var/spack/repos/builtin/packages/phist/package.py6
-rw-r--r--var/spack/repos/builtin/packages/phist/sbang.patch8
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py
index dbc620ff21..162770bd74 100644
--- a/var/spack/repos/builtin/packages/phist/package.py
+++ b/var/spack/repos/builtin/packages/phist/package.py
@@ -5,6 +5,7 @@
from spack import *
+import spack.hooks.sbang as sbang
class Phist(CMakePackage):
@@ -101,6 +102,8 @@ class Phist(CMakePackage):
patch('update_tpetra_gotypes.patch', when='@:1.8.99')
+ patch('sbang.patch', when='+fortran')
+
# ###################### Dependencies ##########################
depends_on('cmake@3.8:', type='build')
@@ -132,6 +135,9 @@ class Phist(CMakePackage):
# to compile some OpenMP statements
conflicts('%gcc@:4.9.1')
+ def setup_build_environment(self, env):
+ env.set('SPACK_SBANG', sbang.sbang_install_path())
+
def cmake_args(self):
spec = self.spec
diff --git a/var/spack/repos/builtin/packages/phist/sbang.patch b/var/spack/repos/builtin/packages/phist/sbang.patch
new file mode 100644
index 0000000000..331ebebabd
--- /dev/null
+++ b/var/spack/repos/builtin/packages/phist/sbang.patch
@@ -0,0 +1,8 @@
+diff --git a/fortran_bindings/cfwrapper.py.in b/fortran_bindings/cfwrapper.py.in
+index 6eb9051..874ce48 100755
+--- a/fortran_bindings/cfwrapper.py.in
++++ b/fortran_bindings/cfwrapper.py.in
+@@ -1,3 +1,4 @@
++#!/bin/bash $ENV{SPACK_SBANG}
+ #!${PYTHON_EXECUTABLE}
+ # -*- coding: utf-8 -*-