summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorDesmond Orton <odesmond21@gmail.com>2021-04-06 13:37:32 -0600
committerGitHub <noreply@github.com>2021-04-06 12:37:32 -0700
commit838bba70c6aca5a30c77924781962c1c244eaa41 (patch)
tree50ca7c08b5ff98cec8d86907aa5df0c525e71577 /var
parent442241d477a8d77f708354ec258a6bb4eab40bdc (diff)
downloadspack-838bba70c6aca5a30c77924781962c1c244eaa41.tar.gz
spack-838bba70c6aca5a30c77924781962c1c244eaa41.tar.bz2
spack-838bba70c6aca5a30c77924781962c1c244eaa41.tar.xz
spack-838bba70c6aca5a30c77924781962c1c244eaa41.zip
salmon: New patch (#22686)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/salmon/package.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py
index 53eba05625..bdbc4aca9d 100644
--- a/var/spack/repos/builtin/packages/salmon/package.py
+++ b/var/spack/repos/builtin/packages/salmon/package.py
@@ -23,7 +23,7 @@ class Salmon(CMakePackage):
depends_on('tbb')
depends_on('boost@:1.66.0', when='@:0.14.1')
- depends_on('boost@1.72.0', when='@1.4.0')
+ depends_on('boost@1.72.0:', when='@1.4.0:')
depends_on('cereal')
depends_on('jemalloc')
depends_on('xz')
@@ -76,6 +76,11 @@ class Salmon(CMakePackage):
'scripts/fetchPufferfish.sh')
symlink('./salmon-v{0}.zip'.format(self.version),
'./external/pufferfish.zip')
+ # Fix issues related to lto-wrapper during install
+ filter_file('INTERPROCEDURAL_OPTIMIZATION True',
+ 'INTERPROCEDURAL_OPTIMIZATION False',
+ 'src/CMakeLists.txt', string=True)
+ filter_file('curl -k.*', '', 'scripts/fetchPufferfish.sh')
def cmake_args(self):
args = [