z572 pushed a commit to branch core-packages-team
in repository guix.
commit a32f1ee4b59bdea6c2b8238e665442b5450d7f4b
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Sun Dec 8 14:49:21 2024 +0100
gnu: llvm-13: Fix build with gcc-14.
* gnu/packages/patches/llvm-13-gcc-14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/llvm.scm (llvm-13): Use it.
Change-Id: I3b9d3b894b0ae6ffe375d3e22f4f4a07d81a77c5
---
gnu/local.mk | 1 +
gnu/packages/llvm.scm | 4 +++-
gnu/packages/patches/llvm-13-gcc-14.patch | 12 ++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0f27e6337d..11db3a70a2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1795,6 +1795,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-13-gcc-14.patch \
%D%/packages/patches/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lsh-fix-x11-forwarding.patch \
%D%/packages/patches/lsof-compat-linux-6.9.patch \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 5052107369..41b15e6791 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2022 Zhu Zihao <[email protected]>
;;; Copyright © 2023 Hilton Chain <[email protected]>
;;; Copyright © 2023-2025 Zheng Junjie <[email protected]>
+;;; Copyright © 2024 Janneke Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -847,7 +848,8 @@ Library.")
(uri (llvm-uri "llvm" version))
(sha256
(base32
- "0d681xiixmx9inwvz14vi3xsznrcryk06a8rvk9cljiq5kc80szc"))))
+ "0d681xiixmx9inwvz14vi3xsznrcryk06a8rvk9cljiq5kc80szc"))
+ (patches (search-patches "llvm-13-gcc-14.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments llvm-14)
((#:phases phases '%standard-phases)
diff --git a/gnu/packages/patches/llvm-13-gcc-14.patch
b/gnu/packages/patches/llvm-13-gcc-14.patch
new file mode 100644
index 0000000000..a7697b01d0
--- /dev/null
+++ b/gnu/packages/patches/llvm-13-gcc-14.patch
@@ -0,0 +1,12 @@
+See: https://github.com/smlnj/smlnj/issues/279
+
+--- llvm-13.0.1.src/include/llvm/Support/Signals.h.orig 2024-12-08
14:34:21.338967469 +0100
++++ llvm-13.0.1.src/include/llvm/Support/Signals.h 2024-12-08
14:32:22.486780827 +0100
+@@ -14,6 +14,7 @@
+ #ifndef LLVM_SUPPORT_SIGNALS_H
+ #define LLVM_SUPPORT_SIGNALS_H
+
++#include <cstdint>
+ #include <string>
+
+ namespace llvm {
