mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 19:39:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: llvm-13: Fix build with gcc-14.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-08 14:49:21 +01:00
parent e9d2cc2d4c
commit ee21382230
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1790,6 +1790,7 @@ dist_patch_DATA = \
%D%/packages/patches/llvm-9-fix-bitcast-miscompilation.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-lpad-miscompilation.patch \
%D%/packages/patches/llvm-9-fix-scev-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/lm-sensors-hwmon-attrs.patch \
%D%/packages/patches/lsh-fix-x11-forwarding.patch \ %D%/packages/patches/lsh-fix-x11-forwarding.patch \
%D%/packages/patches/lsof-compat-linux-6.9.patch \ %D%/packages/patches/lsof-compat-linux-6.9.patch \

4
gnu/packages/llvm.scm
View file

@ -27,6 +27,7 @@
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -829,7 +830,8 @@ Library.")
(uri (llvm-uri "llvm" version)) (uri (llvm-uri "llvm" version))
(sha256 (sha256
(base32 (base32
"0d681xiixmx9inwvz14vi3xsznrcryk06a8rvk9cljiq5kc80szc")))) "0d681xiixmx9inwvz14vi3xsznrcryk06a8rvk9cljiq5kc80szc"))
(patches (search-patches "llvm-13-gcc-14.patch"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments llvm-14) (substitute-keyword-arguments (package-arguments llvm-14)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)

12
gnu/packages/patches/llvm-13-gcc-14.patch Normal file
View file

@ -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 {