From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8NBXN+sJZl9hawAA0tVLHw (envelope-from ) for ; Sat, 19 Sep 2020 13:38:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SNgfM+sJZl/dYQAAbx9fmQ (envelope-from ) for ; Sat, 19 Sep 2020 13:38:51 +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 390B39401AE for ; Sat, 19 Sep 2020 13:38:51 +0000 (UTC) Received: from localhost ([::1]:40896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJd4i-0002H5-BF for larch@yhetil.org; Sat, 19 Sep 2020 09:38:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJd30-0001SY-Do for guix-patches@gnu.org; Sat, 19 Sep 2020 09:37:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kJd30-0005DW-2w for guix-patches@gnu.org; Sat, 19 Sep 2020 09:37:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kJd2z-0001cf-WB for guix-patches@gnu.org; Sat, 19 Sep 2020 09:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42888] [PATCH] gnu: rust: Fix install phase for non-x86_64 platforms. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Sep 2020 13:37: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: 42888@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 42888-submit@debbugs.gnu.org id=B42888.16005225866191 (code B ref 42888); Sat, 19 Sep 2020 13:37:01 +0000 Received: (at 42888) by debbugs.gnu.org; 19 Sep 2020 13:36:26 +0000 Received: from localhost ([127.0.0.1]:45833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kJd2P-0001bn-VN for submit@debbugs.gnu.org; Sat, 19 Sep 2020 09:36:26 -0400 Received: from mout.gmx.net ([212.227.15.15]:53309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kJd2K-0001bW-Kl for 42888@debbugs.gnu.org; Sat, 19 Sep 2020 09:36:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600522574; bh=hdAXU1sDTa9PU1xfSaIS5qUu03cSxMRPFKFTKQ2okho=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=Kyjm3YCmEKt1uF14jTZv1X7CwDgcEznElyRi23IyuhrY0JGf9FuMq62RYyjmzxjme n3GCkjuBDnzc5kCcaMq+aXcmOEq1aWMtJPQV2cf7p6nmBKeUwFuTbex/B6Vznj/4c3 2ml9geqBVsCjSo5Nimc0kNeqNTMc9nga7iM00fkY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.com (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MZkpR-1jwNfG47Z1-00Wq3l; Sat, 19 Sep 2020 15:36:14 +0200 References: <87d03qptmv.fsf@gmx.com> <875z9ips81.fsf@gmx.com> <20200819215552.stnpvcfaj5xpqkn7@gravity> <874koy47g8.fsf@gmx.com> User-agent: mu4e 1.4.13; emacs 27.1 From: Pierre Langlois In-reply-to: <874koy47g8.fsf@gmx.com> Date: Sat, 19 Sep 2020 14:36:04 +0100 Message-ID: <87zh5l6g8r.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:KgwDdQTO+5UzG04AqXuNqXPuY1BJBB/NzUwGr4JzLZjqI26/ZGV GdZJLF5OigKb8RTy8laIGet1ZHAYS3lnGVIbtEe/deL7w1DYSFebPBn7qdGhkZOxhi8Riv5 15o3qeGjAtqO8jFHTlLRcewBIU3L3eYu2SC5KsJ9CX+0rtafjVRnt0bDoKGOOWfBaFq/uED +lKItZO/MGAzgM2Tvo3wQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:wId73NC8z4Q=:YH8XHrDIfXzOWLU4o/NulS 2larg4deNlGNkjAxGy7JGAm5U0nZrKOj+vNbuzRh12b0aQ0d5AFdFKP5+NGx1cnFeQaRF5OBc V1K/we8WJB5HkkV9zJTsFjaEJzaxuV31FFcKZShv7U1HKyGKpNCoNKZlAIJ03x334SfsPo9L7 5sLSDMsIv8ZxRHJv14PS5q6YiqAkZLzvmZBjrhpuraKAmgNZNRa5wGKbKKmuFmNyxPWmyjbbF vXiMzrU5yABBQ1Jf6t0IPwuOPVAzxCozMTbd7avh1Ji30bnIAWqwaaN7nHlLRhUq3odWm15on zDJ9klbRk0o5moowLocZQE5lmSSrVtfiyyDguHJPyXuydjVtzjmLkJ9mwvzaLlxlvzhG64/Y/ NucO0Sq2vYhTiiuj0OgQ6RF9HevVNwH7RYfoONind801asG0m4dqo/9yS+Q4R8ZQ00/yAhxMs wZcfhbza9kSnIy4kYL7zT21YTGwa6R/TcOfXkUoH8dGeDu/GFYbPPEgLc0K4MtZ0oJ7nXI5YS Jbv+FjroKDJHdSQI+HK+iEBQJXr484Krlo0ZiHHji++D0lpdWDFGQ75TMr2s1mOGpe4Xvoymj sJkRc4cSzv9yiJurKRnN2TYttYrpAS98jTMqvYsmUUo2yvO7MWtmCyZhww5xgzHdSpVyUQSl5 0M9L0ZYJWKdvKbzKp3yIIfU88N8NlLyVS41GMF+YKE93E0WdeaKiZ/40B2Cm3Rp3+b+Lh+Pkq 6uMT7hd+cDuZm+ay5LzcFjZKPJXMvG7+pFSY3Kfy0+/7jQ/XcYYDh4wo9bx9+5+vJmBvPq7pe 76/VKVEr7XXlDWxWeZjK03twNFQZcmZMPWeHul0StfWmPfoUaqEDsN32AXhVs/OVGQHAr7BE5 Dlu7zCKkYvBF+wSyTwUq2nFDzAdN2ubu77VYjrX/go1ax+ZGTIU2hRNPW9MBUVzGrcTnXZ1WK Fx8XhVP72gIpPGYDKTLPQ07mWgSFreyLXtlPDWY3di7/OyCDXlqosLRATHYNrp8OlB6zPpkM3 1WPFUPqHQTXvoensieX5bcnKtFvDHWzij8GqX35FR7+tXfsowhLdBgPlZ45ce2Vr2Hl4aV/vP YUME0G6SrcYrZGcJhAmmJObNFF228Abl0KXssanMKuMtAMW2pFHsIceKXhWXCi6ZQHtNbbu3S /FBLFQnOLqy7JoMPhutYCI3z7SXaTzloo+XMkgXZaAi46lRFjbT2/Bi+p76dtoC6cPLeLq8i4 BKSkiG8sXf1mX6b5qyqfd4MQYBOoBEaJf6uKwOw== X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) 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=fail (rsa verify failed) header.d=gmx.net header.s=badeba3b8450 header.b=Kyjm3YCm; dmarc=none; 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: -2.11 X-TUID: qvAPYlUOt9I5 --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-r= ust)) >>> "manifest-rustc")) >>> (for-each >>> (lambda (file) (delete-manifest-file cargo-out fi= le)) >> >> 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? Thanks, Pierre --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAl9mCUQYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UxsQIAI7g9bclJtFypFwJvUopq49k f0BM83IQ08imZ7S2nEyhjPbLyhmvaV9EVCLjTsYn7lZnx24zaGbD4Wt5W2DmSqAQ dEPoS0OKsY3kmOkRMkviRWqrTzA5AaTlP4e0sLkebNgmXQyc2scowQtQaAI8wpSx n9QAg7AsgNBWRR+6pKGFXW/x8q13ocEHNosBGSeoCQDdeIj3Qy0wFcbFe6rgl60u +QmAM0eh1UM/ODXC5oik6yLquAdG8UBrJd/RU6M6VgotSYuoV/z+tad0M2IA0A5H wNqa70h/x6CUA9QXTvjzJSIlUjhdMiPWk2Nf3PICvJaO2UiLiJE5scvp0e6MKCg= =Toli -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-rust-Fix-install-phase-for-non-x86_64-platforms.patch Content-Transfer-Encoding: quoted-printable >From 207071445a0a637075138fb678bdbcdcfbaa038d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sun, 16 Aug 2020 12:17:18 +0100 Subject: [PATCH] gnu: rust: Fix install phase for non-x86_64 platforms. * gnu/packages/rust.scm (rust-1.20)[arguments]: Replace hardcoded x86_64 triplet with nix-system->gnu-triplet-for-rust in 'delete-install-logs phase. --- gnu/packages/rust.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d5914f012b..1690ad96c5 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2018 Danny Milosavljevic ;;; Copyright =C2=A9 2019 Ivan Petkov ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka +;;; Copyright =C2=A9 2020 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -614,7 +615,8 @@ jemalloc =3D \"" jemalloc "/lib/libjemalloc_pic.a" "\" (lambda (file) (delete-manifest-file out file)) '("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 file)) --=20 2.28.0 --=-=-=--