From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qNXYOsCCM2fs9QAA62LTzQ:P1 (envelope-from ) for ; Tue, 12 Nov 2024 16:30:57 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id qNXYOsCCM2fs9QAA62LTzQ (envelope-from ) for ; Tue, 12 Nov 2024 17:30:57 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g3BKBCkq; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=J8A7MLbG; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731429056; a=rsa-sha256; cv=none; b=MDw1Hvgi8SHg2UEq+8CMVal9iITMSlBHIa2s0Q5mBFc6bFJjmuudOikAqrlNSH/9nt8Yxa jS2RHHICmwM2oqLQdtaOUKcvn6b/RZR97QV0A2qAiVtY249D1fy5k1wPn8OJ2vBGsKonuQ 4xuEwiuyBXd3cWYLnPwSQTkHWxe+pT9LN0Rg8qvNjlkGDJn5VvMwjJvGhLRrDv2LBbl2lT ghTKYwULKOIZ6gjXqzy6vIQAFyB+KiYhtWTGdeED90g8eicybF7SbF5tFDQ9FjKzDJuC98 OBMyKkPWRyizXYJZuvLo0vxfnLot8aC/uxWUQU1XtSv37y3cmkLMES0tSmH0vQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g3BKBCkq; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=J8A7MLbG; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1731429056; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=gRWIZ5gzTGHfsFnovkLIfnDEaxWGHk1MMLD2hH2vn3w=; b=UyupHqOxkIcZNtcDBvY6O5XdBTp+YQMZeQM3+9e5Y2st9qB0NAEsa9AlX0AIXf5wftPNzh TAgkbwV9p5BOW6KV0JoWaBXe34aBlaA7/sFzI6HeSFADYzgeqfv7rW0FKy1GKAIOigiaWL rtH9t7uYFHBT7lcSiNQUJrRayUdP3zgS3V/IvTc2n0C7ZV5SG0hmVLJMORuNeJ7aqx6CbE OoQpnuK7VD2aZU8I9Om5RlNkLdV1i9kxvOdfYg6e6BLEmIfPi4VzIL4n7/hzgKjpLCcggL FIC2W9Y74GrwK4AVAf2Lp1uT5tCw/DNBzxApowtWtJhrB9Gavq2CUu7wp4PXuA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A171B65A66 for ; Tue, 12 Nov 2024 17:30:56 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAtmb-00046Q-L2; Tue, 12 Nov 2024 11:30:25 -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 1tAtma-00045T-0p for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:24 -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 1tAtmZ-0005zI-Nk for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -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=gRWIZ5gzTGHfsFnovkLIfnDEaxWGHk1MMLD2hH2vn3w=; b=g3BKBCkqJmLUlJTSBrbLSaTmi36AzNRtEjlFIVHcGDtEv3rqlwB8wRHTDiSwwh3tXJE46SVeEf26HPD5glOTKanrKUKrqxi5Gy+rZRoRU0eJ6ZoTiuX3yFRUHEEYdOXyCDQQU5Owj8oLp5TfCM/B3h4ses+7/3ADb+j7jR3Ph+hFIjC5/2YsS6/eqvJyUNworpwonEwgwqRRtiIvEiVgsmA0evcGzw7Hv7l3KMVzHXNgPtlt0cex0L1YKYxlPzuMkvW7aV2CO0uMtr+XfEWABRzz4gH6Ngu3uvkObtHlYwM5XXloERoa12FlWr2lkq2oVLcqN6xcHKuezApuOfY/rw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tAtmZ-0000ZR-Gw for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v2 31/40] 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, 12 Nov 2024 16:30:23 +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.17314290142026 (code B ref 74290); Tue, 12 Nov 2024 16:30:23 +0000 Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:14 +0000 Received: from localhost ([127.0.0.1]:39208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtmP-0000VP-Fx for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tAtlr-0000KU-RZ for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:40 -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 1tAtjg-0005Pz-IE; Tue, 12 Nov 2024 11:27:24 -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=gRWIZ5gzTGHfsFnovkLIfnDEaxWGHk1MMLD2hH2vn3w=; b=J8A7MLbGye2KrHPthhMB rDe5VqroynmIRQdXt35IZrW+CIc94c7FnqHPoi3XhOlt/yjH4vMmQkRnISDAGriqr5UPvbOHEvVvW ftbUIp2pdVJUTaupACuHcG1YIZg/+xrR3bbRg9cmnwtCAMidZS9CYk3zTtt6GfBSi7bWN1J+6ijPS lNw1gDJ4fSlXRLZGd1KYIIUBJmpUiKjgvOSOLWyCs3mP/Pz5dYqJIz8qjZonlbTT2ScGA1wwVh/zv QFdQPXfNnO/z0WUk8a374+TFdp+3t3N22KOiEJEJGzey1LTHnsPWIv6X65yhydgHwfpGTHulWs3Al JPasAeEvsrayRg==; From: Janneke Nieuwenhuizen Date: Tue, 12 Nov 2024 17:25:40 +0100 Message-ID: <3cfbaa61642a2298009a4ef94d66a02a31a96331.1731427612.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.38 X-Spam-Score: 1.38 X-Migadu-Queue-Id: A171B65A66 X-Migadu-Scanner: mx12.migadu.com X-TUID: 4chlSHxSmrgC * 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) -- Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com