summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAiden Grossman <39388941+boomanaiden154@users.noreply.github.com>2023-07-18 23:28:13 -0700
committerGitHub <noreply@github.com>2023-07-19 08:28:13 +0200
commit90b2e402f510d96c41508c70a1e1ffdacfaac762 (patch)
tree7a4d5cfbd16d5784f6cb90941ea6fe0aee4c3ce0
parent1f17f44def381affc9cf14d46a13435e0863e9a3 (diff)
downloadspack-90b2e402f510d96c41508c70a1e1ffdacfaac762.tar.gz
spack-90b2e402f510d96c41508c70a1e1ffdacfaac762.tar.bz2
spack-90b2e402f510d96c41508c70a1e1ffdacfaac762.tar.xz
spack-90b2e402f510d96c41508c70a1e1ffdacfaac762.zip
elfutils: remove conflicts with clang after version 0.186 (#38945)
In late 2021 elfutils was patched to make it build with clang, and these patches ended up in version 0.186. This commit updates the conflicts to specify this so elfutils can be built with clang.
-rw-r--r--var/spack/repos/builtin/packages/elfutils/package.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py
index 0d168df75d..56a21a7d63 100644
--- a/var/spack/repos/builtin/packages/elfutils/package.py
+++ b/var/spack/repos/builtin/packages/elfutils/package.py
@@ -89,12 +89,9 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
# and https://github.com/libarchive/libarchive/issues/1819
conflicts("^libarchive@3.6.2 +iconv", when="+debuginfod")
- # Elfutils uses nested functions in C code, which is implemented
- # in gcc, but not in clang. C code compiled with gcc is
- # binary-compatible with clang, so it should be possible to build
- # elfutils with gcc, and then link it to clang-built libraries.
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=24964
conflicts("%apple-clang")
- conflicts("%clang")
+ conflicts("%clang", when="@:0.185")
conflicts("%cce")
# Elfutils uses -Wall and we don't want to fail the build over a