From f3c2ebbfb82cb9d88c32bb0bd301c529d1a0ee0b Mon Sep 17 00:00:00 2001
From: Kai Germaschewski <kai.germaschewski@unh.edu>
Date: Sat, 28 Mar 2020 14:06:17 -0400
Subject: [PATCH] fix gcc@8.4.0 build (#15729)
the gcc package.py includes patches for a sanitizer related bug that look
like they've been fixed in gcc 8.4.0, which caused `spack install` to fail.
This PR excludes patching gcc >= 8.4.0 and < 9.0.0.
---
var/spack/repos/builtin/packages/gcc/package.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index b7a08f8538..cf16f1bc8f 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -237,8 +237,8 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
# Backport libsanitizer patch for glibc >= 2.31 and 8.1.0 <= gcc <= 9.2.0
# https://bugs.gentoo.org/708346
- patch('glibc-2.31-libsanitizer-1.patch', when='@8.1.0:9.2.0')
- patch('glibc-2.31-libsanitizer-2.patch', when='@8.1.0:9.2.0')
+ patch('glibc-2.31-libsanitizer-1.patch', when='@8.1.0:8.3.99,9.0.0:9.2.0')
+ patch('glibc-2.31-libsanitizer-2.patch', when='@8.1.0:8.3.99,9.0.0:9.2.0')
# Older versions do not compile with newer versions of glibc
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81712
patch('ucontext_t.patch', when='@4.9,5.1:5.4,6.1:6.4,7.1')
--
GitLab