guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.

commit 6848e1f699611a11deb17e57993d268be2bfff38
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Jul 15 20:46:47 2025 +0200

    gnu: llvm: Fix build with gcc@14.
    
    * gnu/packages/patches/llvm-10-missing-include.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register patch.
    * gnu/packages/llvm.scm (llvm-10, llvm-11)[origin]: Apply patch.
    
    Co-authored-by: tobtoht
    Change-Id: Id5f7aac3c2dc1193adc47b7472534c0269a4255f
---
 gnu/local.mk                                       |  1 +
 gnu/packages/llvm.scm                              |  7 +++++--
 gnu/packages/patches/llvm-10-missing-include.patch | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 881027c2c9..89486de86d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1836,6 +1836,7 @@ dist_patch_DATA =                                         
\
   %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    \
+  %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 56bfa437e1..0accbd4503 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2023 Hilton Chain <[email protected]>
 ;;; Copyright © 2023-2025 Zheng Junjie <[email protected]>
 ;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <[email protected]>
+;;; Copyright © 2025 Andreas Enge <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1002,7 +1003,8 @@ Library.")
      (origin
       (method url-fetch)
       (uri (llvm-uri "llvm" version))
-      (patches (search-patches "llvm-8-missing-include.patch"))
+      (patches (search-patches "llvm-8-missing-include.patch"
+                               "llvm-10-missing-include.patch"))
       (sha256
        (base32
         "199yq3a214avcbi4kk2q0ajriifkvsr0l2dkx3a666m033ihi1ff"))))))
@@ -1054,7 +1056,8 @@ Library.")
      (origin
       (method url-fetch)
       (uri (llvm-uri "llvm" version))
-      (patches (search-patches "llvm-8-missing-include.patch"))
+      (patches (search-patches "llvm-8-missing-include.patch"
+                               "llvm-10-missing-include.patch"))
       (sha256
        (base32
         "1wydhbp9kyjp5y0rc627imxgkgqiv3dfirbqil9dgpnbaw5y7n65"))))
diff --git a/gnu/packages/patches/llvm-10-missing-include.patch 
b/gnu/packages/patches/llvm-10-missing-include.patch
new file mode 100644
index 0000000000..9c56cbca42
--- /dev/null
+++ b/gnu/packages/patches/llvm-10-missing-include.patch
@@ -0,0 +1,14 @@
+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;

Reply via email to