From 8861fe029426649c15f273575e5d7e260c2febc6 Mon Sep 17 00:00:00 2001 From: George Young Date: Wed, 5 Jul 2023 13:36:55 +0100 Subject: salmon: patching to build with %gcc@13: (#38553) Co-authored-by: LMS Bioinformatics --- var/spack/repos/builtin/packages/salmon/package.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py index fbc9224640..553a2d1767 100644 --- a/var/spack/repos/builtin/packages/salmon/package.py +++ b/var/spack/repos/builtin/packages/salmon/package.py @@ -85,6 +85,15 @@ class Salmon(CMakePackage): when="@{0}".format(ver), ) + # `%gcc13:` requires `` to be manually included. Fixed upstream, + # so we patch to allow building of previous salmon versions + patch( + "https://github.com/COMBINE-lab/salmon/commit/ffb2a11.patch?full_index=1", + sha256="5ed3512bae665c1d72002911ab9ee6d213f10df63019ebd9e8e0ecde03823a73", + when="@:1.10.1%gcc@13:", + level=1, + ) + def patch(self): # remove static linking to libstdc++ filter_file("-static-libstdc++", "", "CMakeLists.txt", string=True) -- cgit v1.2.3-70-g09d2