diff options
| author | Luke Diorio-Toth <ldioriototh@gmail.com> | 2023-02-06 06:08:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 13:08:31 +0100 |
| commit | 4c0116bd64b64466b6e3dd33ae451beedf1100ba (patch) | |
| tree | fa863949ddc152d0b6191035eaa8ba6912782ad9 /var | |
| parent | f0d835524820f42766e146284862b929322c9de5 (diff) | |
| download | spack-4c0116bd64b64466b6e3dd33ae451beedf1100ba.tar.gz spack-4c0116bd64b64466b6e3dd33ae451beedf1100ba.tar.bz2 spack-4c0116bd64b64466b6e3dd33ae451beedf1100ba.tar.xz spack-4c0116bd64b64466b6e3dd33ae451beedf1100ba.zip | |
mash: added patch with limits header (#35209)
Co-authored-by: luke <luke@DESKTOP-E4JNTC1.attlocal.net>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/mash/gcc-11.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mash/package.py | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/mash/gcc-11.patch b/var/spack/repos/builtin/packages/mash/gcc-11.patch new file mode 100644 index 0000000000..1220c9cc3c --- /dev/null +++ b/var/spack/repos/builtin/packages/mash/gcc-11.patch @@ -0,0 +1,14 @@ +# patch method from debian repo +# https://salsa.debian.org/med-team/mash/-/blob/master/debian/patches/gcc-11.patch +diff -Naur spack-src/src/mash/robin_hood.h spack-src.patched/src/mash/robin_hood.h +--- spack-src/src/mash/robin_hood.h 2021-02-26 17:13:33.000000000 -0600 ++++ spack-src.patched/src/mash/robin_hood.h 2023-01-27 09:37:40.418855844 -0600 +@@ -45,6 +45,7 @@ + #include <memory> // only to support hash of smart pointers + #include <stdexcept> + #include <string> ++#include <limits> + #include <type_traits> + #include <utility> + #if __cplusplus >= 201703L + diff --git a/var/spack/repos/builtin/packages/mash/package.py b/var/spack/repos/builtin/packages/mash/package.py index 6b2f97fe1d..4f6ac17988 100644 --- a/var/spack/repos/builtin/packages/mash/package.py +++ b/var/spack/repos/builtin/packages/mash/package.py @@ -18,7 +18,7 @@ class Mash(AutotoolsPackage): version("2.3", sha256="f96cf7305e010012c3debed966ac83ceecac0351dbbfeaa6cd7ad7f068d87fe1") - conflicts("%gcc@11:", msg="mash cannot be build with gcc >= 11") + patch("gcc-11.patch", when="%gcc@11:") depends_on("autoconf", type="build") depends_on("automake", type="build") |