From patchwork Tue Nov 19 06:55:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70539 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 25E6827BBE2; Tue, 19 Nov 2024 07:01:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B86C527BBEC for ; Tue, 19 Nov 2024 07:01:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDIDl-00010c-0V; Tue, 19 Nov 2024 02:00:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDIDY-0000kY-D9 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:08 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tDIDY-0004kd-1Y for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=OTe1SPDEKlGUVJcHLucSP0lZZQm/j1Dv9REbTNTmy5ImyqCsQtqYi00jCcMnnjEpBR+s4KZsOs8r29acMeAttzzYaVrMLz+5c+G3RZjJUdTlNbO4e7lRRkj+ZCrVptl4YFIZc1BkXgEGcOJKTJVaxJOqLPmgU6kMvzHtcL6dN99P2zMHIrfAMlaqyhuvsCjlMoG9ksPxLypoguV2qF4EwQAiNDMdgDgmZflVu7qlC3FFBmUSCxRO1pFJCIRNTVnMBVAhVIduim3ZqV90JA6uLoXvzLOWPaCGAa8Nhe1KZO+rPtVPaZzNT7ectHCK52Qv9ZUjxoNa8PjnElNqrVR9mA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDIDX-0005P5-Rd for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 40/51] gnu: m4: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 07:00:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959220606 (code B ref 74290); Tue, 19 Nov 2024 07:00:07 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:52 +0000 Received: from localhost ([127.0.0.1]:40665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIDH-0005MC-JS for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDICI-0005BX-3q for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tDIA7-00045P-J3; Tue, 19 Nov 2024 01:56:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=jCJ0C5wf6WwpDPlRftOHTJMUCHlacoa1lsMC2E1/S1Y=; b=HI+DxWZOk5xUJiTjObU9 X2MNnCKz5MLBm3Sv918MJaaQag3VpF1M5n2PYhInLhKK4M/ptbFsaeOpAvIJqSvk3dVPiViFRjX6F Q0c3X6QyxdlZI9m68fJgSRuHXRzM1gKtYYCg1SHGe6jyMuHmmb/M/X7wpdc2IB9edW6hKHWzNLGW4 y47MrKiyLe19lZkrNtYFzZT5J3GLZgKyIyU0oftk3x3dB6EClXsgY3uSr79Z/uAwWR+Qy+/8c80rs veHLOJgVv5vs4P4RdkyAfuXez7JnTVSPkrSMeu8hhMue3y6UxsX0vCl1txuYGEMHEBG6gL0wPtn1d 7HjDWlYFi7djxQ==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:55:10 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2022 Marius Bakke -;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +64,13 @@ (define-public m4 (("(^| )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)