From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 +JtZMKrfQmd6kgAAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:11:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +JtZMKrfQmd6kgAAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:11:22 +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=tpRXjIsA; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hlnrBJI0; 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=1732435882; a=rsa-sha256; cv=none; b=D8fIc1TMroEUFfoni3atOOotifqb89oZ00Ap6hXvGvMsfz1A8ib9P7tE8cJMOQtb7TQxc0 ywnrDBMJRM8e6GyoQJkhXqgviMNrVQdqwDmv6XqNop6IvnFkldE/oMnq50QvJeQTUsjY16 X8kVAlVSZ0KR2V7f1j5Z1B/g220W6GO0GZPEzxksGXKx+5puiHxahvyNNg0z9PBFYIQTKE Gwlm7fr6uMgbxaOhdiQfBhJx+h3sQebI6IJqzIDWjv9eeNVtCtJCPMDIWmm/h6hZG3xLcM waMplvqBaOiqngOjxiEPNbgo+uz+H2acwfp3W1quXapdBb+7HMZq6JSrX0uMcw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=tpRXjIsA; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hlnrBJI0; 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=1732435882; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=Pavl9pEt3G5Dl49hSDAQhXnoKFeoA3TfimXP20DNXhOG4A5MLBlnjFOKPKRUwJT3MslB54 LIZYVTemSj14Zmf3FUfNxS+ENzoCu3E3C67ChiFPMsWvX5JHRT81hL0WDMEbQWhoWcOdyq IvWbWL9nfa9qwppeIM1Ipu8Db8A+fFMNkPhFXqi80UjrUtWgbtsMBcGSvBt4gbTxf7JP8p /4E1Wn5RBhqjLghwC0z6IoIq7MVz9yH7WqxhyI9BZE5NXhpAXAtscQk6FrWWVUfteN1D90 cwnGD+haiWvhps0XlKObKYVsL/XW1qj9CABcVa1YEIm3vbWLxmFKKOHrvKDTNw== 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 6EF9A4606 for ; Sun, 24 Nov 2024 09:11:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UQ-0000Ax-OO; Sun, 24 Nov 2024 02:57:06 -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 1tF7UO-0000AG-LS for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:04 -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 1tF7UO-0002KD-Cu; Sun, 24 Nov 2024 02:57:04 -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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=tpRXjIsAIcBi3POTXgpz8ue9QNftTE5D9lWsWg742hg3yqlif5KeQo9PO0BMJPHT+KJmmwXOpjtkSPQS5M1fmvWPK7RgcjcZgbNEzVs8vC8k6mF/cQkSn1hsZR/fMiTiGOD9AOcFShT68b94ZGqPhTkngKffwrVQFWVoMcllnVKbh1EkgfyvRjyoGMnaBuBwl2S06K+VI1tQJNAfY/Y06CwendDB7BJ9o1IkL/zLnh/q9BUEv5VMYco0zSwyzhEqmawcvUN4/EpEX1gyShphQ/vtTpu97t6G4vpLtpe0LC7s9fQLGVhlXZ0LP5G01440Cbg+g899PlJBQ9XLK1m85g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fC-6r; Sun, 24 Nov 2024 02:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 08/58] gnu: grep: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:04 +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 Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497217445 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:12 +0000 Received: from localhost ([127.0.0.1]:60673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TX-0004XC-MN for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TP-0004UO-KE for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:04 -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 1tF7TK-0001uj-Dg; Sun, 24 Nov 2024 02:55:58 -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=vLwAI3pRadCOc+xAtqkPxBUO3GXJJJLG0R5f3eTwliQ=; b=hlnrBJI0O5Mc82RQm0i1 eC5rL2W5Tu1Cue1nPX25O8n4Af/YRT31Q7U/28zeVrbj+2XRbO53uSIBjcY6kxq1aq9AVfkQOsE20 EVbv4fqBmtJ7EtmdgNJqjRn4M1p1d0jIhaY7RMeDeOWOTscUoZlI2WGQb8pHjDGsu7TmK11PXJz0B +HJMW6h6NHOhaYeFTiFUjIKjtM+Qlk3cayQ++FP7lj/pMJ+TvyE4PzjyFMc8XUVpeubkfyqyIxrfS cRTADOWsxd9BQXpn2nmWAeQr6JjpC56SLW5NI2SUllTvHqkIDBdXCCVOAgzYrEopVIonh0bVIp3of v2DzK7UZ/9pTUg==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:31 +0100 Message-ID: <28e3737472cbdbe6cd9d3771706568ee62fc0501.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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.83 X-Spam-Score: -1.83 X-Migadu-Queue-Id: 6EF9A4606 X-Migadu-Scanner: mx12.migadu.com X-TUID: +DKaTCxlQe0f * gnu/packages/base.scm (grep)[arguments]: When building for the 64bit Hurd, add patch-sigsegv.h stage. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 02ef71f20d..010be631d7 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -154,6 +154,13 @@ (define-public grep (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep")))))) + #$@(if (target-hurd64?) + #~((add-after 'unpack 'patch-sigsegv + (lambda _ + ;; Stack overflow recovery does not compile + (substitute* "lib/sigsegv.in.h" + (("__GNU__") "__XGNU__"))))) + #~()) #$@(if (system-hurd?) #~((add-before 'check 'skip-test (lambda _ -- 2.46.0