[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
39/51: gnu: m4: Fix build for the 64bit Hurd.
From: |
guix-commits |
Subject: |
39/51: gnu: m4: Fix build for the 64bit Hurd. |
Date: |
Mon, 18 Nov 2024 18:13:26 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 03e6a1315e4fb02f693891106afef4c1a9dc2dae
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Nov 10 22:47:26 2024 +0100
gnu: m4: Fix build for the 64bit Hurd.
* gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd,
add patch-sigsegv.h stage.
Change-Id: I82993ebde268867348893556a9476faa5c4e9453
---
gnu/packages/m4.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/m4.scm b/gnu/packages/m4.scm
index 39b50b6800..081304db34 100644
--- a/gnu/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
-;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -64,6 +64,13 @@
(("(^| )main *\\(.*" all)
(string-append all "{\n exit (77);//"))))))
'())
+ ,@(if (target-hurd64?)
+ '((add-after 'unpack 'patch-sigsegv
+ (lambda _
+ ;; Stack overflow recovery does not compile
+ (substitute* "lib/sigsegv.in.h"
+ (("__GNU__") "__XGNU__")))))
+ '())
(add-after 'unpack 'configure-shell
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((/bin/sh (search-input-file (or native-inputs inputs)
- 10/51: gnu: libxcrypt: Support the 64bit Hurd., (continued)
- 10/51: gnu: libxcrypt: Support the 64bit Hurd., guix-commits, 2024/11/18
- 11/51: gnu: libstdc++: Support the 64bit Hurd., guix-commits, 2024/11/18
- 03/51: gnu: hurd: Update to 0.9.git20240714., guix-commits, 2024/11/18
- 04/51: gnu: Add basic support for x86_64-pc-gnu target, aka 64bit Hurd., guix-commits, 2024/11/18
- 05/51: gnu: cross-libc: Support cross-building for the 64bit Hurd., guix-commits, 2024/11/18
- 06/51: gnu: bash-minimal: Support [cross-]build with gcc-14., guix-commits, 2024/11/18
- 14/51: gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd., guix-commits, 2024/11/18
- 16/51: gnu: libffi: Fix [cross-]build with gcc-14., guix-commits, 2024/11/18
- 29/51: gnu: pciutils: Support the 64bit Hurd., guix-commits, 2024/11/18
- 21/51: gnu: libedit: Fix [cross-]build with gcc-14 for 32bit., guix-commits, 2024/11/18
- 39/51: gnu: m4: Fix build for the 64bit Hurd.,
guix-commits <=
- 33/51: gnu: rumpkernel: Update to f1ffd6405f225336e595a0f99f01095ed7438337., guix-commits, 2024/11/18
- 44/51: gnu: gettext: Fix cross-build shebangs., guix-commits, 2024/11/18
- 46/51: gnu: guile-lzlib: Support the 64bit Hurd., guix-commits, 2024/11/18
- 38/51: gnu: guile-fibers: Fix build for the 64bit Hurd., guix-commits, 2024/11/18
- 09/51: gnu: patch: Fix build for the 64bit Hurd., guix-commits, 2024/11/18
- 13/51: gnu: bash: Avoid hang when cross-built for the Hurd., guix-commits, 2024/11/18
- 15/51: gnu: flex: Fix [cross-]build with gcc-14., guix-commits, 2024/11/18
- 17/51: gnu: perl: Support [cross-]building with gcc-14 and for 64bit Hurd., guix-commits, 2024/11/18
- 22/51: gnu: libssh: Fix [cross-]build with gcc-14 for 32bit., guix-commits, 2024/11/18
- 23/51: gnu: cross-base: Update %xgcc to gcc-14, to support the 64bit Hurd., guix-commits, 2024/11/18