From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YNXbJfohP2KgfwEAgWs5BA (envelope-from ) for ; Sat, 26 Mar 2022 15:23:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AOgrI/ohP2JDhQEA9RJhRA (envelope-from ) for ; Sat, 26 Mar 2022 15:23:54 +0100 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 1C7E7ABD6 for ; Sat, 26 Mar 2022 15:23:54 +0100 (CET) Received: from localhost ([::1]:41980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nY7KW-0005fc-8B for larch@yhetil.org; Sat, 26 Mar 2022 10:23:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY7Fu-0000sd-Ku for guix-patches@gnu.org; Sat, 26 Mar 2022 10:19:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY7Fu-0004d9-Bv for guix-patches@gnu.org; Sat, 26 Mar 2022 10:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nY7Fu-0006xi-8d for guix-patches@gnu.org; Sat, 26 Mar 2022 10:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54580] [PATCH staging?] gnu: mrustc: Update to 0.10. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Mar 2022 14:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54580 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Pierre Langlois Cc: 54580@debbugs.gnu.org Received: via spool by 54580-submit@debbugs.gnu.org id=B54580.164830429626699 (code B ref 54580); Sat, 26 Mar 2022 14:19:02 +0000 Received: (at 54580) by debbugs.gnu.org; 26 Mar 2022 14:18:16 +0000 Received: from localhost ([127.0.0.1]:54464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY7F5-0006wR-9A for submit@debbugs.gnu.org; Sat, 26 Mar 2022 10:18:15 -0400 Received: from mout.gmx.net ([212.227.17.22]:37823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY7F3-0006wE-Ec for 54580@debbugs.gnu.org; Sat, 26 Mar 2022 10:18:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648304283; bh=sbT/qPXD/oFvNu8sHUSSMArhjwR1AW+/jvE3Lhq0JjE=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=hI4jL1iuvESi47Ah2msXgeKVBG0Z9WP+aDs1XkSIZTgT+AIjHjKjb9LbFPBaqhTI7 YlBuMOIIdu2wgC0lwoU+dPd7+y5cwCtbm/P6aosf+w1tLnH7upMxFPm7Cyi+tC8oEg THJ775red++Nx6EsaSBPXYUdXpri6pV6SpNfLjyE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N3KTy-1oFjkP0UQU-010IMb; Sat, 26 Mar 2022 15:18:03 +0100 References: <87lewwbzwy.fsf@gmx.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Pierre Langlois Date: Sat, 26 Mar 2022 14:16:06 +0000 In-reply-to: <87lewwbzwy.fsf@gmx.com> Message-ID: <87h77kajc9.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:RX29/g8d3ZrRR7sidCi1BV0AXuhi9uHhPndlE/3ianFkAk4lMJ8 6CaeY55gy9zJOlk+jBqe+RqHwXopZv++lMOCHRJbLdZmfIaUDaULH45fw7F+Gh3wilhVveB 79djmD559VNsaypJAuhAqyuZj74n61V+Xvnqle85EJVq1sAPulcTrhShqsImj3sED31zPVD 7DWbkEb9HPmdInoCRJ5hA== X-UI-Out-Filterresults: notjunk:1;V03:K0:Ij5OhmjGIc8=:HKujeq8LIvCu0RDXe4oGN5 bUWApPVTfTiSyKzQLV31AIrAjDI8F/0Vs/tz9p2CuW+IzPWtQTTaWcmSCiJUPwq4Flj7MMY1y An0lheCwz9LWracYPlTsoDLcbE/F0I4oO5eIHtvQ0HKJqkzRm4txKfWliElSlmKNzy7vopuxC 3OhxkN6Nzf1mea9Ur28hjsPMRpr23xoZOLwvzCJuO0mIkueCCQy2PGCD0SkYepE1kua2YHfMR 2zZsoCnf0gOSJIk7EsKIuA9MPdZmUzQXjTep6+A5pHDwUYJBhpFTxLewDbT2Tj5Rk8DGk3pKo wy1JdxHdZMem05L2OvjA3p7OYsXqYBc37DI636jteTT/JX1FcKNr8nPmzNZnyu34SaaM8d7Qw BsYzZqp6xuwewUsQ4B+LLEWII2gciWMG1rlzRsU7WwjediBF4pQCv+Pqis/3wH4sNHbqbUl+z rGb1iFy4Mb67KHPz4MHApKj42fWAqHmloJRxpNHV/mA93QeMZ6eU9XGHQBD45tD17mo843kXX UqfsqxGsZSpW7U7d5Q+x6/O6FLXu9YAR3cf3vhVq3AXOBAu4XfoFxxwNc1DFcTMfuue5zVNfX Pfm37j+rF9yTAxLzmljvIa3+ssg3WbxOiq1WhQg74UTFb73BNZ87dEdcGJLmvrzjGlx8v/WBK pQCdmp6IX5gvpA/GacPFrYQe+3TI6CcsckAgMR4uKfORRF/YsPq4K2H5e8edNp1JJBXDBQrgU QwVth33p/HSu9+fDmqFFOFc3SHAPCXfOAA99+xyDN7f7BT/sE9J4gwoL9T5JMqmAhKuwoN6Ok Vzrz8JKlkKtZGB+kY5UoEdMM8x0HCHTSh9iTfiL9W+lg2Nfd2aLJuN2KcAQdPdnwcKtWbJckg zRou7GaJDlOsilFIOifNHH+dzeRqZzcyqxz23uu1Sy/57IuNY6MMNRUXWVzIKSOREcOenMBSI 6oaU30DS4JtCOPWW5MxCD5fgJx6IV50X5cGu2si1laGOdLeWwk9JUaLCgrcqRJQP7zcPqOKwp nL2UJLMx7TODxRMzKh0tB7gHCaghjtTDYLix4QklgXvd3s0cjfHRqEq8J6xUz7XreshB0Tk9D GEIIoEwMhv467s= 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648304634; 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: dkim-signature; bh=yOr6jfy40jytTdVCrEsJ/43RnetahBZFs7nHUuwCqqo=; b=fcMrxbGWj42JfaMePJjbKkaPYbRPD7I1lycSVK4MxgKPotwCjGRqRJzl0gzHIPu60Xun0H 3eYedeoePVV5n3GJuLAHsGPGsxw4VXAp3/hYv9vRWgwa6owph61OsW7AU8ZqlckZfnMypV v3YfWtXClOr5q9g50zOAEk/9AaNiOS5fn5aRnDCZiyX1IaJZdf7n8dhb2N4Y1Ndm7nFwSg kmrmiR5AUmmcHOUBV4fOmO3JPOtOlIWRDwqgA6T7TAD69Y9K1THAbENoS8g6w5SHGmXb5W 11bn7XmGLxLdfC/0OFo3Tziq3NYvVBxFhz+382qN0+hUi3QhvVx6lEi6CKkzpQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648304634; a=rsa-sha256; cv=none; b=C1gvipK/rLAmoxu0IxFKWCtuuGLw9Ihz3s5PtCi3Titrhz6/qf8rHelahkvUgh44N+aFVX YJY409iXypw/JTX9ybHqqMUJuTLEUEYG1/31S4v+BUUesUuaKiMIManKDxB4bGnKZpBfZ2 P9xL/sKo7uAVJP8/XFWVIiLc/vR7Gg2Bi+8e2U0+ntAZX6HrZnAONF/2y7CNrZ8CFBwv0C RxCJwZ/olnSeDenWKKLR4zdjIrjQpUcmWLRzF8eENN0+uZFGcbLyZXSvwd9BK1EZfDNVUY U47tBHCqCFM1aNMge12qcq32XoEeHuqcASLghp3pZvE0F2XQUt94Bwk9AI5o5g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=hI4jL1iu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); 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" X-Migadu-Spam-Score: 3.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=hI4jL1iu; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (policy=none); 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" X-Migadu-Queue-Id: 1C7E7ABD6 X-Spam-Score: 3.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: wKE41Kc0ap/W --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Pierre Langlois writes: > [[PGP Signed Part:Undecided]] > Hi Guix! > > Good news everyone, I managed to get a aarch64 build of Rust by updating > mrustc to 0.10! Sadly, i686 is still unsupported, due to the build > using too much memory, it must be the same for other 32-bit architectures. > > I tested this on a pinebookpro which only has 4G of RAM, I had to attach > 16G of swap for the initial rust@1.39 build to succeed, then the whole > rust chain took about 5 days! I also tested on my x86_64 desktop. > > Here's the patch! After it we should be able to follow-up and enable > Gnome and friends. > > That being said, I wasn't entirely sure where this patch should go, > ideally it would be good to have a staging branch rather than > core-updates, WDYT? Maybe we can do this along with a rust version > update? > > PS: I also tried to build rust 1.54 with the new mrustc update, to > shorten the chain, but I've not had any successes with it yet. > > [[End of PGP Signed Part]] > From 555b3b21ead25d09b56e6287d5542da1abfb13c4 Mon Sep 17 00:00:00 2001 > From: Pierre Langlois > Date: Sat, 26 Mar 2022 13:21:17 +0000 > Subject: [PATCH] gnu: mrustc: Update to 0.10. > > And enable rust for aarch64-linux! > > * gnu/packages/rust.scm (%mrustc-commit): Update hash. > (%mrustc-source): Update to 0.10. > (rust-1.39)[arguments]: Move and adapt the substitute* that prevent > fetching sources. Patch /bin/sh in run_rustc/rustc_proxy.sh. > [supported-systems]: Add aarch64-linux. > --- > gnu/packages/rust.scm | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index 26d6df7a94..7a841e4326 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -124,9 +124,9 @@ (define* (rust-bootstrapped-package base-rust version checksum) > ;;; to be used in source form. The latest support for bootstrapping from > ;;; 1.39.0 is not yet released so use the latest commit (see: > ;;; https://github.com/thepowersgang/mrustc/issues/185). Oh, I forgot to adapt this comment, the last sentence can be removed now there's a release. Attached a fixed patch. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmI/IJYYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UGJoH/jbG0RvO3mQGqxBZDlf7MpVT 530UuTUjQWxWhPxwGtFgqPPcYVsERvN8Ed1hFrfWxjmCqjMaz5t4zYlLA7cw03WU v2wLyoLpjczqo9MwA7fL5k4Dpx3tw9Pe243mua0GqJnFHQyPLetCuE6dMqbcWlEC qht9Txn93DJXeAF2xq7DD1/yZORQ+LlSLiWa98EbcDCKWVgY2G++46NM8UpgvX44 xQV7+3f5g87FOnNrzCGxqIr88n1K5FqDtCzOC8efWiri1eHQNwrTDak97WmiHmlo uBjj2MgmDMsF4NcidNlX/R0ZBxHi5YrSLIIn7SWqdBLCacxHjEgiBfZWupZaqQo= =Mbps -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-mrustc-Update-to-0.10.patch Content-Transfer-Encoding: quoted-printable =46rom cdf2c194834ff55428a22988e4d90f0c133e9eb3 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 26 Mar 2022 13:21:17 +0000 Subject: [PATCH] gnu: mrustc: Update to 0.10. And enable rust for aarch64-linux! * gnu/packages/rust.scm (%mrustc-commit): Update hash. (%mrustc-source): Update to 0.10. (rust-1.39)[arguments]: Move and adapt the substitute* that prevent fetching sources. Patch /bin/sh in run_rustc/rustc_proxy.sh. [supported-systems]: Add aarch64-linux. =2D-- gnu/packages/rust.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 26d6df7a94..67dc5cdaf3 100644 =2D-- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -121,12 +121,10 @@ (define* (rust-bootstrapped-package base-rust versio= n checksum) (package-native-inputs base-rust)))))) ;;; Note: mrustc's only purpose is to be able to bootstap Rust; it's desi= gned -;;; to be used in source form. The latest support for bootstrapping from -;;; 1.39.0 is not yet released so use the latest commit (see: -;;; https://github.com/thepowersgang/mrustc/issues/185). -(define %mrustc-commit "c7066542f8e93d320323749216bf3c82aecb67c2") +;;; to be used in source form. +(define %mrustc-commit "b364724f15fd6fce8234ad8add68107c23a22151") (define %mrustc-source - (let* ((version "0.9") + (let* ((version "0.10") (commit %mrustc-commit) (revision "1") (name "mrustc")) @@ -138,7 +136,7 @@ (define %mrustc-source (file-name (git-file-name name (git-version version revision commit= ))) (sha256 (base32 - "0zv1x6601s5fnnkcdlqkc4bknisqz569qb0iyb9rjsmaf1kh0na3"))))) + "0f7kh4n2663sn0z3xib8gzw0s97qpvwag40g2vs3bfjlrbpgi9z0"))))) ;;; Rust 1.39 is special in that it is built with mrustc, which shortens = the ;;; bootstrap path. @@ -237,10 +235,11 @@ (define rust-1.39 ,(string-take %mrustc-commit 7) "\\\"" " -D VERSION_BUILDTIME=3D" "\"\\\"Thu, 01 Jan 1970 00:00:01 +0000\\\"\"" - " -D VERSION_GIT_ISDIRTY=3D0\n")) + " -D VERSION_GIT_ISDIRTY=3D0\n"))) + (substitute* "minicargo.mk" ;; Do not try to fetch sources from the Internet. - ((": \\$\\(RUSTC_SRC_DL\\)") - ":")) + (("\\$\\(MINICARGO\\) \\$\\(RUSTC_SRC_DL\\)") + "$(MINICARGO)")) (substitute* "run_rustc/Makefile" (("[$]Vtime ") "$V ") @@ -248,6 +247,9 @@ (define rust-1.39 (("-j [[:digit:]]+ ") "") ;; Patch the shebang of a generated wrapper for rustc + (("#!/bin/sh") + (string-append "#!" (which "sh")))) + (substitute* "run_rustc/rustc_proxy.sh" (("#!/bin/sh") (string-append "#!" (which "sh")))))))) (add-after 'patch-generated-file-shebangs 'patch-cargo-checksums @@ -322,9 +324,9 @@ (define rust-1.39 safety and thread safety guarantees.") (home-page "https://github.com/thepowersgang/mrustc") - ;; So far mrustc is x86_64-only. It may support i686 soon: + ;; So far mrustc is (x86_64|aarch64)-only. It may support i686 soon: ;; . - (supported-systems '("x86_64-linux")) + (supported-systems '("x86_64-linux" "aarch64-linux")) ;; Dual licensed. (license (list license:asl2.0 license:expat)))) =2D- 2.34.0 --=-=-=--