From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id a4jvDcY9bl8tUwAA0tVLHw (envelope-from ) for ; Fri, 25 Sep 2020 18:58:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SAtYCcY9bl8FIAAAB5/wlQ (envelope-from ) for ; Fri, 25 Sep 2020 18:58:14 +0000 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 810A1940876 for ; Fri, 25 Sep 2020 18:58:13 +0000 (UTC) Received: from localhost ([::1]:50920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLsv4-000174-P1 for larch@yhetil.org; Fri, 25 Sep 2020 14:58:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLsuw-00016m-9Y for guix-patches@gnu.org; Fri, 25 Sep 2020 14:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLsuw-0001oJ-0T for guix-patches@gnu.org; Fri, 25 Sep 2020 14:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLsuv-0006sV-VB for guix-patches@gnu.org; Fri, 25 Sep 2020 14:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42888] [PATCH] gnu: rust: Fix install phase for non-x86_64 platforms. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Sep 2020 18:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Langlois , 42888@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 42888-submit@debbugs.gnu.org id=B42888.160106025926409 (code B ref 42888); Fri, 25 Sep 2020 18:58:01 +0000 Received: (at 42888) by debbugs.gnu.org; 25 Sep 2020 18:57:39 +0000 Received: from localhost ([127.0.0.1]:45354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLsuZ-0006rs-22 for submit@debbugs.gnu.org; Fri, 25 Sep 2020 14:57:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLsuX-0006rg-D3 for 42888@debbugs.gnu.org; Fri, 25 Sep 2020 14:57:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43250) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLsuR-0001mI-Tx; Fri, 25 Sep 2020 14:57:31 -0400 Received: from [80.232.114.98] (port=36568 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kLsuP-0002PZ-5O; Fri, 25 Sep 2020 14:57:29 -0400 From: Marius Bakke In-Reply-To: <87zh5l6g8r.fsf@gmx.com> References: <87d03qptmv.fsf@gmx.com> <875z9ips81.fsf@gmx.com> <20200819215552.stnpvcfaj5xpqkn7@gravity> <874koy47g8.fsf@gmx.com> <87zh5l6g8r.fsf@gmx.com> Date: Fri, 25 Sep 2020 20:57:27 +0200 Message-ID: <87lfgx4rc8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -3.61 X-TUID: ob0yoJrqJVRn --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Pierre Langlois writes: > Hello Guix! > > Pierre Langlois writes: > >> Hi Jakub, >> >> Jakub K=C4=85dzio=C5=82ka writes: >> > > (snip) > >>> Pierre, >>> >>> thanks for your patch! I was working on a similar change before, but >>> when I tried it, it failed even earlier in the bootstrap chain. It >>> might've been QEMU weirdness, though, a la #42448. >>> >>>> @@ -612,9 +613,10 @@ jemalloc =3D \"" jemalloc "/lib/libjemalloc_pic.a= " "\" >>>> (cargo-out (assoc-ref outputs "cargo"))) >>>> (for-each >>>> (lambda (file) (delete-manifest-file out file)) >>>> - '("install.log" >>>> + `("install.log" >>>> "manifest-rust-docs" >>>> - "manifest-rust-std-x86_64-unknown-linux-gnu" >>>> + ,,(string-append "manifest-rust-std-" >>>> + (nix-system->gnu-triplet-for-= rust)) >>>> "manifest-rustc")) >>>> (for-each >>>> (lambda (file) (delete-manifest-file cargo-out f= ile)) >>> >>> If I understand the code correctly, this quasiquote is unnecessary, as >>> the host-side code will evaluate to a string that can be inserted as-is, >>> without another unquote on the build side. >>> >>> Fixing this would mean that the patch can go on master, since it would >>> now only trigger rebuilds on architectures that are already broken. >> >> Ooooh yeah, that'll be much better, I've attached a patch that does just >> that. I can confirm it doesn't trigger a full rebuild, nice! >> > > I've just rebased this patch and fixed a little formatting issue. I've > made sure, it doesn't trigger any rust rebuilds on x86. > > Is this OK to commit? LGTM! Thanks a lot for tackling this long-standing issue. Were you able to build all the way to the latest Rust? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl9uPZcACgkQoqBt8qM6 VPpM+gf/eDlhnS8jRJGPRYn016KZnAAl0XLx0xL7IbOXBnlHQuq8U/ETsUazofKs /rSdS0wZPXU85WuoqHsHB1BaM4UixeGBdwrxFL5vK5uARoSl6wryjiceXF7maUKW P5mn46jth0Q6YAj0SIZHHmwjHjKgH6j46x4TRkSJVEewzSO4RpIvd2Mvh5vGVaX0 7Ul2qN3IC+qPezOZLL7MLSfjesFV3WAks0NjaeTKrvE3uKwRpa/zDRvGo04s/f9n zkSHX0KFZcTDTOyUqqCp50XcZ6PhaIFzNpvcBDaPUj6v78/Gsj5XAEy0CgrHAiZ5 xcsFG/Ik+MgPi1656PYcDdDwysZHHg== =MZHO -----END PGP SIGNATURE----- --=-=-=--