guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 33ffbab4343d860789093f5bb5d6e200862e5184
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Aug 19 21:24:34 2025 +0200
gnu: Remove llvm-11.
* gnu/packages/llvm.scm (llvm-11): Delete variable.
* gnu/packages/patches/llvm-10-missing-include.patch,
gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch,
gnu/packages/patches/llvm-8-missing-include.patch: Remove files.
* gnu/local.mk (dist_patch_DATA): Unregister files.
Change-Id: I5f5f96119a7c1a097285aa98380dad633ed7db14
---
gnu/local.mk | 3 --
gnu/packages/llvm.scm | 14 ---------
gnu/packages/patches/llvm-10-missing-include.patch | 14 ---------
.../patches/llvm-8-fix-build-with-gcc-10.patch | 34 ----------------------
gnu/packages/patches/llvm-8-missing-include.patch | 17 -----------
5 files changed, 82 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 48b77df401..e59e66ca50 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1832,9 +1832,6 @@ dist_patch_DATA =
\
%D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \
%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-10-missing-include.patch \
%D%/packages/patches/llvm-13-gcc-14.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lsh-fix-x11-forwarding.patch \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 1a759781a0..2456abb1b5 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1024,20 +1024,6 @@ Library.")
(define-public clang-toolchain-12
(make-clang-toolchain clang-12 libomp-12))
-(define-public llvm-11
- (package
- (inherit llvm-12)
- (version "11.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (llvm-uri "llvm" version))
- (patches (search-patches "llvm-8-missing-include.patch"
- "llvm-10-missing-include.patch"))
- (sha256
- (base32
- "199yq3a214avcbi4kk2q0ajriifkvsr0l2dkx3a666m033ihi1ff"))))))
-
(define-public llvm-6
(package
(inherit llvm-12)
diff --git a/gnu/packages/patches/llvm-10-missing-include.patch
b/gnu/packages/patches/llvm-10-missing-include.patch
deleted file mode 100644
index 9c56cbca42..0000000000
--- a/gnu/packages/patches/llvm-10-missing-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Provided by tobtoht, see
https://codeberg.org/guix/guix/issues/1234#issuecomment-5838284
-
-diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h
-index e0a18e72..c66ea8b3 100644
---- a/include/llvm/Support/Signals.h
-+++ b/include/llvm/Support/Signals.h
-@@ -15,6 +15,7 @@
- #define LLVM_SUPPORT_SIGNALS_H
-
- #include <string>
-+#include <cstdint>
-
- namespace llvm {
- class StringRef;
diff --git a/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch
b/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch
deleted file mode 100644
index 9b36cc772c..0000000000
--- a/gnu/packages/patches/llvm-8-fix-build-with-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b288d90b39f4b905c02092a9bfcfd6d78f99b191 Mon Sep 17 00:00:00 2001
-From: Than McIntosh <[email protected]>
-Date: Fri, 19 Jul 2019 13:13:54 +0000
-Subject: [PATCH] [NFC] include cstdint/string prior to using uint8_t/string
-
-Summary: include proper header prior to use of uint8_t typedef
-and std::string.
-
-Subscribers: llvm-commits
-
-Reviewers: cherry
-
-Tags: #llvm
-
-Differential Revision: https://reviews.llvm.org/D64937
-
-llvm-svn: 366572
----
- llvm/include/llvm/Demangle/MicrosoftDemangleNodes.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/llvm/Demangle/MicrosoftDemangleNodes.h
b/include/llvm/Demangle/MicrosoftDemangleNodes.h
-index da9d9d5bfdc0c..3d47471f0ef0e 100644
---- a/include/llvm/Demangle/MicrosoftDemangleNodes.h
-+++ b/include/llvm/Demangle/MicrosoftDemangleNodes.h
-@@ -16,6 +16,8 @@
- #include "llvm/Demangle/DemangleConfig.h"
- #include "llvm/Demangle/StringView.h"
- #include <array>
-+#include <cstdint>
-+#include <string>
-
- namespace llvm {
- namespace itanium_demangle {
diff --git a/gnu/packages/patches/llvm-8-missing-include.patch
b/gnu/packages/patches/llvm-8-missing-include.patch
deleted file mode 100644
index 4d7ca6d332..0000000000
--- a/gnu/packages/patches/llvm-8-missing-include.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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"
