From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0LLTISEvOWQmWgEASxT56A (envelope-from ) for ; Fri, 14 Apr 2023 12:46:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UH2TISEvOWS/XwEAauVa8A (envelope-from ) for ; Fri, 14 Apr 2023 12:46:57 +0200 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 E86D827069 for ; Fri, 14 Apr 2023 12:46:56 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnGwj-0007oM-K5; Fri, 14 Apr 2023 06:46:25 -0400 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 1pnGwO-0007kG-MO for bug-guix@gnu.org; Fri, 14 Apr 2023 06:46:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnGwM-00072e-OA for bug-guix@gnu.org; Fri, 14 Apr 2023 06:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnGwM-0001iL-Ix for bug-guix@gnu.org; Fri, 14 Apr 2023 06:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#61879: Patch Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 14 Apr 2023 10:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61879 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Andreas Enge Cc: 61879@debbugs.gnu.org Received: via spool by 61879-submit@debbugs.gnu.org id=B61879.16814691176468 (code B ref 61879); Fri, 14 Apr 2023 10:46:02 +0000 Received: (at 61879) by debbugs.gnu.org; 14 Apr 2023 10:45:17 +0000 Received: from localhost ([127.0.0.1]:45624 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnGvV-0001g9-K2 for submit@debbugs.gnu.org; Fri, 14 Apr 2023 06:45:16 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnGvN-0001fG-It for 61879@debbugs.gnu.org; Fri, 14 Apr 2023 06:45:08 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 27EC9171D0; Fri, 14 Apr 2023 11:45:00 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4fc8b657; Fri, 14 Apr 2023 10:44:58 +0000 (UTC) References: <87bkjqx48h.fsf@cbaines.net> User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines Date: Fri, 14 Apr 2023 11:37:05 +0100 In-reply-to: Message-ID: <873552wxnb.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681469217; a=rsa-sha256; cv=none; b=J/OeILfoJXCsXTyXu6PTfeNM8Jb5CK89MiVfM7/CWgJsbG62okKQwp23aIt4kWuOpMjZD7 AiKZS+O1CZsUbC6z2xMVRBhd4mG5fWZDnsGsOlF/4gdVNNDYESPj86Ni0fbr74h+ne2o0F vXbUihnZIneNYAL6JyfFBDAM9Rcf2LF4lfgc9SkgBuMfpuGiVdF3Dm3gR5APF6flJ1EObo OvIAYZd8ri0mVtZtanznIZJvXLfHr0Ph3UC2zXMIfRtKLU3b3lFTkjpSTKUO89hkdu6jLh Gmhs9dGlS73eNf739vR7Hpb+WLSjIyQzTHvoapVp2ynZHyOW0Ank6LPNv/5xxA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681469217; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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; bh=KPkL8B7cPV9KXIOgXQqyCvA6rq7Rogu+o3LELIRFfec=; b=tkWslOV36SwLn+Ku7CcMCaY+tFZMdnyL1p70dVfUASveSKXPt63RbSJC5tThwGYwInFdlc WePZhKlBEUKgDoDQrnWKGFrWPF5BUiFMERdRIjm99M+BpyVvUaxyBCFjbazAxlLdFbt4wZ 9eqF0HwO/JdAw2NcJW3kdzcpwjnu7W+tOod1pSCYPBwgshLO6AB8JzQPEzPkmAVRAO7HtL uhL+6xP3aAgQwbqycQ321OJ7C+86tbfveWXjDSmq5r7OmyrreJRaTNDhgiR/B8qibgqDrb 3vlPLHpw7Jvujb088EMFNPRpsZAOgcaEAHGvDM5wkSI+M2kp4sg2EqjDN2qJ4w== X-Migadu-Queue-Id: E86D827069 Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -4.32 X-Spam-Score: -4.32 X-TUID: KPoMX5qQnXkB --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Andreas Enge writes: > Am Fri, Apr 14, 2023 at 09:20:03AM +0100 schrieb Christopher Baines: >> I haven't tried this yet, but I've had a quick look. I'm not sure >> search-patches will work where it is, since that'll be running in the >> build environment, without any access to the patches in the Guix git >> repository. > > Good point. But is this not exactly like your previous commit, which > I understood you had tested? But you are right: > https://ci.guix.gnu.org/build/909454/log/raw > error: in phase 'patch-powerpc': uncaught exception: > unbound-variable #f "Unbound variable: ~S" (search-patch) #f=20 > phase `patch-powerpc' failed after 0.0 seconds > I will revert (the good news: it indeed did not break any other > architecture). > > If we do not have access to the patch during build, we would need to > replace it by an invocation of substitute*, with a lot of escaping of > special characters like line ends, which would be annoying to test > (well, one could test on x86_64 on a dummy package with the same source > as gcc-11). The changes I muddled together differed in that the search-patches bit was ungexp'ed, so the patch file was handled through that mechanism. The other important change is the actual patch itself differed as well (ec needs moving up a bit). I've made those changes to the commit you pushed earlier and pushed to core-updates now. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmQ5LqhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XflAg/+IfCZx0YF66Ea55PszhFnTHK1dir5/AL3 3BsB5Ls1o3yUJYY4CHd7yapnS9C4KEhMS0I5VdtPe+0R52rtTkLq1mKplgfe6bZn 6vZ25F9aFXEnIOqpWPWm0Il1kmjAnc4rfQyWggWBN69rGtU9RieHS6LUNTe6acBx +7sz2dTu9nXW0xKjrSwbWlptCndCneG0rb0bNGbLmI0hjDXvcAoVtNiIiA6wDWYu yWimSlfndwWnSF1RvQtREOrAh19AVTAIwIIhRLQ15yXA85uHR4voWrZIhM8aTOSJ mn+cRJg1z6OsXeyRLJDWFOtpcwI7rIi/rQEy7ES2eTG9EZkhlFtHgpvY1HXF0kth dJMFyIHPIuRDbwQbnxDK1IW9swCwxE3iP04AiRtrlqqHUjPCNJ3meJPK/MwQbaWv VNSKATnnlIyYkViINi+L31oEbV5PdpLFGZKvaOdbDa1hj0neMWrNc2cARtQgS3XW /+9rnZZCv2ebCXvsNfpmhV+R8NSXRcjWvaRY9RnjQJXHNEnNzrk0X+/6shFwhwP1 8oZtMySqUIMxD6E1UoDvubK9KDYP2c5PJVOcEZl3Uxc5UXGMDAfr1IKTXW/UZIi5 aPLeNiWaCznE9Awz2lkhCybZp34YyBT0E02sbpjf9rzqDihJX2TrfTPePWHxcVcU Qdjqg9RhMaY= =EMAq -----END PGP SIGNATURE----- --=-=-=--