diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2022-02-22 03:24:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 09:24:29 +0100 |
| commit | 2ab1ace5f47e8f8397553fa8cb65ed7bd5810806 (patch) | |
| tree | 21ebd295efd4b1db3251fbebc47635f624939253 | |
| parent | 8daee48231b09e0812c6a8f6993519aaad2cee14 (diff) | |
| download | spack-2ab1ace5f47e8f8397553fa8cb65ed7bd5810806.tar.gz spack-2ab1ace5f47e8f8397553fa8cb65ed7bd5810806.tar.bz2 spack-2ab1ace5f47e8f8397553fa8cb65ed7bd5810806.tar.xz spack-2ab1ace5f47e8f8397553fa8cb65ed7bd5810806.zip | |
rhash: un-block intel builds (#29117)
| -rw-r--r-- | var/spack/repos/builtin/packages/rhash/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rhash/rhash-intel20.patch | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/rhash/package.py b/var/spack/repos/builtin/packages/rhash/package.py index 94462d1370..6567454e45 100644 --- a/var/spack/repos/builtin/packages/rhash/package.py +++ b/var/spack/repos/builtin/packages/rhash/package.py @@ -23,6 +23,10 @@ class Rhash(MakefilePackage): patch('https://github.com/rhash/RHash/commit/4dc506066cf1727b021e6352535a8bb315c3f8dc.patch?full_index=1', when='@1.4.2', sha256='3fbfe4603d2ec5228fd198fc87ff3ee281e1f68d252c1afceaa15cba76e9b6b4') + # Intel 20xx.yy.z works just fine. Un-block it from the configure script + # https://github.com/rhash/RHash/pull/197 + patch('rhash-intel20.patch') + # For macOS build instructions, see: # https://github.com/Homebrew/homebrew-core/blob/master/Formula/rhash.rb diff --git a/var/spack/repos/builtin/packages/rhash/rhash-intel20.patch b/var/spack/repos/builtin/packages/rhash/rhash-intel20.patch new file mode 100644 index 0000000000..7a9eefb1c2 --- /dev/null +++ b/var/spack/repos/builtin/packages/rhash/rhash-intel20.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 59d432b..cadbffe 100755 +--- a/configure ++++ b/configure +@@ -500,7 +500,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then + cc_version="v. ?.??, bad" + cc_fail=yes + ;; +- 10.1|11.1|12.*|13.*) ++ 10.1|11.1|12.*|13.*|20*) + cc_version="$cc_version, ok" + ;; + *) |