diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-11 19:22:15 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-11 22:39:14 +0200 |
| commit | e9afd8a00595fdc07a0df3a7680cecdb8aa16df7 (patch) | |
| tree | fed87a5f397c05eaefe1065c8679ff655b14a5ae /gnu | |
| parent | c9085d3bf636984bc74eae89ac02b952ac743d1f (diff) | |
| download | guix-e9afd8a00595fdc07a0df3a7680cecdb8aa16df7.tar guix-e9afd8a00595fdc07a0df3a7680cecdb8aa16df7.tar.gz | |
gnu: LLVM: Add missing include statement for compatibility with GCC 11.
* gnu/packages/patches/llvm-8-missing-include.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/llvm.scm (llvm-11, llvm-10, llvm-9, llvm-8)[source](patches):
Add it.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/llvm-8-missing-include.patch | 17 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 407098e895..8bd2e40f80 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1443,6 +1443,7 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-3.6-fix-build-with-gcc-10.patch \ %D%/packages/patches/llvm-3.x.1-fix-build-with-gcc.patch \ %D%/packages/patches/llvm-8-fix-build-with-gcc-10.patch \ + %D%/packages/patches/llvm-8-missing-include.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 5a2f411eb2..141a1ef5b1 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -866,6 +866,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (origin (method url-fetch) (uri (llvm-uri "llvm" version)) + (patches (search-patches "llvm-8-missing-include.patch")) (sha256 (base32 "0s94lwil98w7zb7cjrbnxli0z7gklb312pkw74xs1d6zk346hgwi")))))) @@ -899,6 +900,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (origin (method url-fetch) (uri (llvm-uri "llvm" version)) + (patches (search-patches "llvm-8-missing-include.patch")) (sha256 (base32 "1wydhbp9kyjp5y0rc627imxgkgqiv3dfirbqil9dgpnbaw5y7n65")))) @@ -943,6 +945,7 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (base32 "16hwp3qa54c3a3v7h8nlw0fh5criqh0hlr1skybyk0cz70gyx880")) (patches (search-patches + "llvm-8-missing-include.patch" "llvm-9-fix-bitcast-miscompilation.patch" "llvm-9-fix-scev-miscompilation.patch" "llvm-9-fix-lpad-miscompilation.patch")))) @@ -986,7 +989,8 @@ with that of libgomp, the GNU Offloading and Multi Processing Library.") (sha256 (base32 "1rvm5gqp5v8hfn17kqws3zhk94w4kxndal12bqa0y57p09nply24")) - (patches (search-patches "llvm-8-fix-build-with-gcc-10.patch")))) + (patches (search-patches "llvm-8-fix-build-with-gcc-10.patch" + "llvm-8-missing-include.patch")))) (license license:ncsa))) (define-public clang-runtime-8 diff --git a/gnu/packages/patches/llvm-8-missing-include.patch b/gnu/packages/patches/llvm-8-missing-include.patch new file mode 100644 index 0000000000..4d7ca6d332 --- /dev/null +++ b/gnu/packages/patches/llvm-8-missing-include.patch @@ -0,0 +1,17 @@ +Add missing include statement for compatibility with libstdc++ 11. + +Taken from upstream: + + https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1 + +diff --git a/utils/benchmark/src/benchmark_register.h b/utils/benchmark/src/benchmark_register.h +--- a/utils/benchmark/src/benchmark_register.h ++++ b/utils/benchmark/src/benchmark_register.h +@@ -1,6 +1,7 @@ + #ifndef BENCHMARK_REGISTER_H + #define BENCHMARK_REGISTER_H + ++#include <limits> + #include <vector> + + #include "check.h" |