GNU bug report logs - #38106
[PATCH] gnu: mrustc: Update to 0.8.1.

Previous Next

Package: guix-patches;

Reported by: Danny Milosavljevic <dannym <at> scratchpost.org>

Date: Thu, 7 Nov 2019 18:21:02 UTC

Severity: normal

Tags: patch

Done: Danny Milosavljevic <dannym <at> scratchpost.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38106 in the body.
You can then email your comments to 38106 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Thu, 07 Nov 2019 18:21:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 07 Nov 2019 18:21:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: guix-patches <at> gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Thu,  7 Nov 2019 19:19:49 +0100
* gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/rust.scm (mrustc): Update to 0.8.1.
[source](patches): Remove it.
---
 gnu/local.mk                                      |  1 -
 ....0-fix-variable-length-integer-receiving.patch | 15 ---------------
 gnu/packages/rust.scm                             |  6 ++----
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 2513b4003c..5f52372875 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1140,7 +1140,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/mozjs38-tracelogger.patch		\
   %D%/packages/patches/mozjs38-version-detection.patch		\
   %D%/packages/patches/mrrescue-support-love-11.patch		\
-  %D%/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch \
   %D%/packages/patches/mtools-mformat-uninitialized.patch	\
   %D%/packages/patches/mumble-1.2.19-abs.patch			\
   %D%/packages/patches/mumps-build-parallelism.patch		\
diff --git a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch b/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch
deleted file mode 100644
index 9e76653a07..0000000000
--- a/gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/thepowersgang/mrustc/issues/109
-From: Danny Milosavljevic <dannym <at> scratchpost.org>
-Date: Fri, 3 Jan 2019 13:00:00 +0100
-
---- mrustc/src/expand/proc_macro.cpp.orig	2019-02-01 14:16:54.208486062 +0100
-+++ mrustc/src/expand/proc_macro.cpp	2019-02-01 14:17:14.350925705 +0100
-@@ -977,7 +977,7 @@
-     for(;;)
-     {
-         auto b = recv_u8();
--        v |= static_cast<uint64_t>(b) << ofs;
-+        v |= static_cast<uint64_t>(b & 0x7F) << ofs;
-         if( (b & 0x80) == 0 )
-             break;
-         ofs += 7;
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index f3fee4c126..eefdec8e0d 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -91,7 +91,7 @@
   (let ((rustc-version "1.19.0"))
     (package
       (name "mrustc")
-      (version "0.8.0")
+      (version "0.8.1")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -100,9 +100,7 @@
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i"))
-                (patches
-                 (search-patches "mrustc-0.8.0-fix-variable-length-integer-receiving.patch"))))
+                  "00800zckq009kf9v3hb8kp1svryvq3jpg4439ksm3wcidjvszdzc"))))
       (outputs '("out" "cargo"))
       (build-system gnu-build-system)
       (inputs




Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Wed, 04 Dec 2019 16:56:02 GMT) Full text and rfc822 format available.

Message #8 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: Marius Bakke <mbakke <at> fastmail.com>, 38106 <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Wed, 04 Dec 2019 17:55:43 +0100
Hi,

Danny Milosavljevic <dannym <at> scratchpost.org> skribis:

> * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Remove it.
> * gnu/packages/rust.scm (mrustc): Update to 0.8.1.
> [source](patches): Remove it.

It LGTM.  However, we need to synchronize with Marius and others to
determine which branch it should go to: maybe ‘staging’, probably not
‘master’, due to the long chain of rebuilds involved that prevents
IceCat from being available.

What do people think?

Thanks,
Ludo’.




Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Wed, 04 Dec 2019 18:33:02 GMT) Full text and rfc822 format available.

Message #11 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Brett Gilio <brettg <at> posteo.net>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>,
 Marius Bakke <mbakke <at> fastmail.com>, 38106 <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Wed, 04 Dec 2019 12:31:57 -0600
Ludovic Courtès <ludo <at> gnu.org> writes:


> What do people think?

Not a maintainer for this package. But I agree with Ludo, this needs to
go in a different branch to prevent a massive rebuild.

-- 
Brett M. Gilio
https://git.sr.ht/~brettgilio/




Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Sun, 19 Jan 2020 21:37:01 GMT) Full text and rfc822 format available.

Message #14 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>, 38106 <at> debbugs.gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Sun, 19 Jan 2020 22:36:24 +0100
[Message part 1 (text/plain, inline)]
Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Remove it.
> * gnu/packages/rust.scm (mrustc): Update to 0.8.1.
> [source](patches): Remove it.

Was there any problems with this patch, or can we apply it on 'staging'?
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Sun, 19 Jan 2020 22:12:02 GMT) Full text and rfc822 format available.

Message #17 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38106 <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Sun, 19 Jan 2020 23:11:05 +0100
[Message part 1 (text/plain, inline)]
Hi Marius,

On Sun, 19 Jan 2020 22:36:24 +0100
Marius Bakke <mbakke <at> fastmail.com> wrote:

> Danny Milosavljevic <dannym <at> scratchpost.org> writes:
> 
> > * gnu/packages/patches/mrustc-0.8.0-fix-variable-length-integer-receiving.patch: Delete file.
> > * gnu/local.mk (dist_patch_DATA): Remove it.
> > * gnu/packages/rust.scm (mrustc): Update to 0.8.1.
> > [source](patches): Remove it.  
> 
> Was there any problems with this patch, or can we apply it on 'staging'?

I'm pretty sure it did work.

But I'm testing moving to mrustc 0.9 immediately right now, might want to wait
for that (or not--doesn't make much of a difference except for the useless
rebuilds).
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Mon, 20 Jan 2020 19:13:02 GMT) Full text and rfc822 format available.

Message #20 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38106 <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Mon, 20 Jan 2020 20:12:45 +0100
[Message part 1 (text/plain, inline)]
Hi Marius,

I'm still not done with the 0.9 version.

The current problem is that a glibc update apparently removed <sys/ustat.h>--so
I would have to patch upstream rust <at> 1.19.0
(rustc-1.19.0-src/src/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc:163)
on staging.

Is that known already?  Does Rust work on staging (without my changes)?

The 0.8.1 mrustc should work--but I don't have the free CPU/memory capacity to test it now.

I have an account on bayfront but cannot compile guix there (from manual checkout).  I get:

error: failed to load 'guix/scripts/pack.scm':
ice-9/eval.scm:293:34: no binding `zip' to hide in module (gnu packages compression)

even after removing all .go files and removing ~/.cache/guile .
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Mon, 20 Jan 2020 19:47:01 GMT) Full text and rfc822 format available.

Message #23 received at 38106 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: ludo <at> gnu.org, 38106 <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Mon, 20 Jan 2020 20:45:49 +0100
[Message part 1 (text/plain, inline)]
> I have an account on bayfront but cannot compile guix there (from manual checkout).  I get:
> 
> error: failed to load 'guix/scripts/pack.scm':
> ice-9/eval.scm:293:34: no binding `zip' to hide in module (gnu packages compression)
> 
> even after removing all .go files and removing ~/.cache/guile .

(That was because gnu/packages/rust.scm had a misplaced parenthesis.  It did
provide an error message for the parenthesis and then continued to load a lot
of files until it finally failed with the error message above.  I did not see
the first error message at first)
[Message part 2 (application/pgp-signature, inline)]

Reply sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
You have taken responsibility. (Tue, 21 Jan 2020 07:37:01 GMT) Full text and rfc822 format available.

Notification sent to Danny Milosavljevic <dannym <at> scratchpost.org>:
bug acknowledged by developer. (Tue, 21 Jan 2020 07:37:02 GMT) Full text and rfc822 format available.

Message #28 received at 38106-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38106-done <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Tue, 21 Jan 2020 08:35:45 +0100
[Message part 1 (text/plain, inline)]
Pushed to guix staging as commit 400a4d65acde14182fd9741d8a46ed5a6e8fd1d7
after extensive testing on bayfront.

Commit 84800833eac3fd92e685d7977f3b4b06fc32aa44 cleans up mrustc a bit.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Tue, 21 Jan 2020 16:42:02 GMT) Full text and rfc822 format available.

Message #31 received at 38106-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 38106-done <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Tue, 21 Jan 2020 17:41:33 +0100
[Message part 1 (text/plain, inline)]
Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> Pushed to guix staging as commit 400a4d65acde14182fd9741d8a46ed5a6e8fd1d7
> after extensive testing on bayfront.
>
> Commit 84800833eac3fd92e685d7977f3b4b06fc32aa44 cleans up mrustc a bit.

I don't see these commits on Savannah?

https://git.savannah.gnu.org/cgit/guix.git/log/?h=staging
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Tue, 21 Jan 2020 16:48:02 GMT) Full text and rfc822 format available.

Message #34 received at 38106-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38106-done <at> debbugs.gnu.org
Subject: Re: bug#38106: [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Tue, 21 Jan 2020 17:47:16 +0100
[Message part 1 (text/plain, inline)]
Apparently it wasn't pushed successfully before, so pushed now.

Pushed to guix staging as commit 6839095af7f6c8a8d5ad481db22cd4ece0a1b5e3
after extensive testing on bayfront.

Commit b07384b5647057a67cd46109bd0272a195165855 cleans up mrustc a bit.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Tue, 21 Jan 2020 20:25:01 GMT) Full text and rfc822 format available.

Message #37 received at 38106-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 38106-done <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Tue, 21 Jan 2020 21:23:59 +0100
[Message part 1 (text/plain, inline)]
Hi,

I've updated mrustc to 0.9 now in guix staging commit
5b600fcae65df18c617adc0e5c35e98484e2b3cc.

We still aren't bootstrapping Rust 1.29.0 directly from mrustc.

This concludes this round's Rust changes to staging from me.
Bootstrapping Rust 1.29.0 directly from mrustc will not work in this round.
[Message part 2 (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#38106; Package guix-patches. (Tue, 21 Jan 2020 21:31:01 GMT) Full text and rfc822 format available.

Message #40 received at 38106-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 38106-done <at> debbugs.gnu.org
Subject: Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.
Date: Tue, 21 Jan 2020 22:29:58 +0100
[Message part 1 (text/plain, inline)]
Danny Milosavljevic <dannym <at> scratchpost.org> writes:

> Hi,
>
> I've updated mrustc to 0.9 now in guix staging commit
> 5b600fcae65df18c617adc0e5c35e98484e2b3cc.
>
> We still aren't bootstrapping Rust 1.29.0 directly from mrustc.
>
> This concludes this round's Rust changes to staging from me.
> Bootstrapping Rust 1.29.0 directly from mrustc will not work in this round.

Excellent, thanks!  Good progress regardless.  :-)
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 19 Feb 2020 12:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years and 38 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.