diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2024-12-08 14:49:21 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:12 +0200 |
| commit | 8136ff2d48b12892c262aea086533f94234f4792 (patch) | |
| tree | 47909f668dab69ce1ff57752e8207fc755fe0300 | |
| parent | 8df0a32579a79e188c7b4fd1d6c6e07474d0f3e1 (diff) | |
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
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/llvm.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/llvm-13-gcc-14.patch | 12 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 719679f679e..56f3c882054 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1826,6 +1826,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 226ab13e537..305ea089f95 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023-2025 Zheng Junjie <z572@z572.online> +;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -852,7 +853,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 00000000000..a7697b01d00 --- /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 { |