guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

38/50: gnu: m4: Fix build for the 64bit Hurd.


From: guix-commits
Subject: 38/50: gnu: m4: Fix build for the 64bit Hurd.
Date: Mon, 18 Nov 2024 16:43:20 -0500 (EST)

janneke pushed a commit to branch hurd-team
in repository guix.

commit 4b813e03b08a9006b62c045659569210ecf50556
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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]