summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAndreas Baumbach <healther@users.noreply.github.com>2021-05-19 21:15:02 +0200
committerGitHub <noreply@github.com>2021-05-19 12:15:02 -0700
commite7b11c3098637e477e9fec30d4213488f25b689e (patch)
tree6c960188fe6328b1eb8625f140282f5694afcc66 /var
parentf3c3fc74931a891d6ea0e354d266896bb279a31a (diff)
downloadspack-e7b11c3098637e477e9fec30d4213488f25b689e.tar.gz
spack-e7b11c3098637e477e9fec30d4213488f25b689e.tar.bz2
spack-e7b11c3098637e477e9fec30d4213488f25b689e.tar.xz
spack-e7b11c3098637e477e9fec30d4213488f25b689e.zip
cquery package: patch for gcc@10: (#23679)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cquery/fix-gcc10.patch10
-rw-r--r--var/spack/repos/builtin/packages/cquery/package.py3
2 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cquery/fix-gcc10.patch b/var/spack/repos/builtin/packages/cquery/fix-gcc10.patch
new file mode 100644
index 0000000000..3e62637f0f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cquery/fix-gcc10.patch
@@ -0,0 +1,10 @@
+diff -purw src/options.h src/options.h
+--- src/options.h 2020-05-13 13:26:39.743491698 +0200
++++ src/options.h 2020-05-13 13:28:47.277181534 +0200
+@@ -1,5 +1,6 @@
+ #pragma once
+
++#include <string>
+ #include <unordered_map>
+
+ std::unordered_map<std::string, std::string> ParseOptions(int argc,
diff --git a/var/spack/repos/builtin/packages/cquery/package.py b/var/spack/repos/builtin/packages/cquery/package.py
index fbca073b09..f9338a2ab4 100644
--- a/var/spack/repos/builtin/packages/cquery/package.py
+++ b/var/spack/repos/builtin/packages/cquery/package.py
@@ -18,6 +18,9 @@ class Cquery(CMakePackage):
depends_on('llvm')
+ # trivial patch (missing header) by mueller@kip.uni-heidelberg.de
+ patch('fix-gcc10.patch', level=0, when='%gcc@10.0:')
+
def cmake_args(self):
args = ['-DCMAKE_EXPORT_COMPILE_COMMANDS=YES',
'-DSYSTEM_CLANG=ON']