From patchwork Tue Nov 12 16:25:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70291 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 D755227BBEA; Tue, 12 Nov 2024 16:30:55 +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=ham 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 9079027BBE2 for ; Tue, 12 Nov 2024 16:30:55 +0000 (GMT) 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 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)