[PATCH] gnu: mrustc: Update to 0.8.1.

Done

Details

4 participants

Brett Gilio
Danny Milosavljevic
Ludovic Courtès
Marius Bakke

Owner: unassigned

Submitted by: Danny Milosavljevic

Severity: normal

Debbugs page

Danny Milosavljevic wrote 5 years ago

Recipients:(address . guix-patches@gnu.org)(name . Danny Milosavljevic)(address . dannym@scratchpost.org)

Message-ID:20191107181949.24679-1-dannym@scratchpost.org

* 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

Toggle diff (57 lines)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@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

Ludovic Courtès wrote 5 years ago

Recipients:(name . Danny Milosavljevic)(address . dannym@scratchpost.org)

Message-ID:87tv6gc9o0.fsf@gnu.org

Hi,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

Toggle quote (5 lines)

> * 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’.

Brett Gilio wrote 5 years ago

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:87lfrsosbm.fsf@posteo.net

Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (2 lines)

> 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/

Marius Bakke wrote 5 years ago

Recipients:(name . Danny Milosavljevic)(address . dannym@scratchpost.org)

Message-ID:878sm3uo13.fsf@devup.no

Danny Milosavljevic <dannym@scratchpost.org> writes:

Toggle quote (5 lines)

> * 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'?

Danny Milosavljevic wrote 5 years ago

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 38106@debbugs.gnu.org)

Message-ID:20200119231048.039dbad7@scratchpost.org

Hi Marius,

On Sun, 19 Jan 2020 22:36:24 +0100

Marius Bakke <mbakke@fastmail.com> wrote:

Toggle quote (9 lines)

> Danny Milosavljevic <dannym@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).

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4k0/kACgkQ5xo1VCww

uqUepQf9Gn3NC+1UQHulWo/qdTJxKs+2x+bzBMpYjg1db39JY1yQkjxAWnQaQx+5

2hABR+Of2LKINH3oI9em3MKz8YRq04l2HC8vfxew4Hi+HRgPl4kaDu5vCJ1YElGA

4vXkjKEXOUjvcnNhKl1/cpuZLKd2rvsOnWQHamE/AFoltKulApxXiEp99YVxv/jB

IOKTNZIxCbYk1DOFrV99R+FAZNtzX9A+a9lReM4tRIlM50G4X5Hl/yB/rZKWWmUK

qs3IX8jpWXOALVzhN9EzGp4SwD19UDuWGE5TxUgj2LbVLa/Hh8HHodlvxctQKHRd

jL+G85+ZWm0jR6VDk39Z9kTXjqDd8Q==

=ZZGB

-----END PGP SIGNATURE-----

Danny Milosavljevic wrote 5 years ago

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 38106@debbugs.gnu.org)

Message-ID:20200120201245.6f716a2c@scratchpost.org

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@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 .

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4l+60ACgkQ5xo1VCww

uqX8Cwf/YNwhVcTwNVpUr06tk7xpBd9XdtyURfEL3jm6K2sJQigPs777yg1kV/mQ

uxwzNrdwFw3DzdmYnC+xXGClCAVT7b12FOw3GvgqVbDqw2rXiaPNGMviqH1oDjk/

Oq8d7nAAml/cvJIJFTq9QQ+NlEU5EKuKnqlv5PK/niSwnFXNI1ruxFq9hill7Fw0

zjo/0IalOFyHAxcYU9eMNwUFgYYnlwcQIICfxmlqhfIYYDBaSasNrmXTqGnd5xLs

VztCOSDlN46sG/qrUFM6RptDFxv9ZUJo+Ft7fP/2WS+KbwZlrECAkNPPdNaJnjld

4FF02eE26SfOtLPUpmOtq/KmbTTXfw==

=obhd

-----END PGP SIGNATURE-----

Danny Milosavljevic wrote 5 years ago

Recipients:

Message-ID:20200120204549.75cad432@scratchpost.org

Toggle quote (7 lines)

> 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)

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4mA20ACgkQ5xo1VCww

uqWzsgf/f09q10ap3YdySzYG8xXE9xK4k3IaTS7vV3xnY/WChTy2dzGsi+KYPp+J

4Y5AbtrBDZZ/RqwFCjFh02Up9/PdjVLq2mEtjCwkLXZ3bv/lWX0JJqto9hao1+n4

rTZk5EcGDe0VlDf3gQgy+4dWdFdOVevPPaEO0AJsaocUPewOopIJyjsCNaxMoUC8

rqkiIMVQpULQQsZkh54x21lEYT0JXmiakE3cJK2ONZDwbHUEyjNozFqulnk7I8DR

jHATfZk/mjipF33P/0rFY+1vIUlcjC6pUJa8cGGGdZXQm1adwQRfrqzOJ60LYBps

HsvfJ2NRkqBadF98Ij/7PcxFSnMnUQ==

=Djps

-----END PGP SIGNATURE-----

Danny Milosavljevic wrote 5 years ago

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 38106-done@debbugs.gnu.org)

Message-ID:20200121083545.53dc6773@scratchpost.org

Pushed to guix staging as commit 400a4d65acde14182fd9741d8a46ed5a6e8fd1d7

after extensive testing on bayfront.

Commit 84800833eac3fd92e685d7977f3b4b06fc32aa44 cleans up mrustc a bit.

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4mqdEACgkQ5xo1VCww

uqWEFwf/epXeUSrUJBu+kC/LrM01pPPV7/IMoTvUtdZHcDHYQTtLGOdhEumwS8mx

ONX4L7TK3moh2fvp+i7UMuLkb5bg8rqW+fAs/VoFWqS9828fL6YcAHB06R/U/ou3

aRaZIM2FSbj7PK3i4r0YnLrQZZmT8GB8JaIAnXCgcsbbb40jLFpxw41nvfFyBy3D

w0xmTxVzgmELsUCUPuu6uPsCDeqICh+O77gYtTCW2xKeMQ5b6pzU3eAnndapZ1jM

uWJpLRaPYI+605qhLp0FE7cPWsVY0hTuesHHh9wzlmmRsawENbrtQfztsygCCNBs

Fadx8u3hJlU4FR6FRk+2DqnDI5meGA==

=i2BA

-----END PGP SIGNATURE-----

Closed

Marius Bakke wrote 5 years ago

Recipients:(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 38106-done@debbugs.gnu.org)

Message-ID:87wo9ku5he.fsf@devup.no

Danny Milosavljevic <dannym@scratchpost.org> writes:

Toggle quote (5 lines)

> 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

Closed

Danny Milosavljevic wrote 5 years ago

Re: bug#38106: [PATCH] gnu: mrustc: Update to 0.8.1.

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 38106-done@debbugs.gnu.org)

Message-ID:20200121174716.306fb9e6@scratchpost.org

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.

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4nKxQACgkQ5xo1VCww

uqWNQggAmfIG41c3wETMMQmhdztHlxMTjTshLaTtTBKVpFEya+4yzfyf7b4SdvLY

EukMiOVQKNBs5zfhJ/id/Kt9jytOAkvGGTgK0fUFlazKjZNtJ6B27pYLfo9sr+YY

mEatrrSnBQF0kwiNcv2aGT8o19iasjclZaELjejbtjZsp8nwzmeUv6jQ0WR+oZ90

uceoMRwpOcFOru/gDjv3/CnuR2JcS3Un6DFm0fePG3hM5GR6PkIWtCuFKvEwsc8U

A8aDKaLXKNGvfeteU5OPWpBOB2AMfOLfe8+3krTBhub9CY85HnltdZmpecJFE0D0

91yBEvvseGtFr9rUjoCpRbUkP+vhjA==

=ycTN

-----END PGP SIGNATURE-----

Closed

Danny Milosavljevic wrote 5 years ago

Re: [bug#38106] [PATCH] gnu: mrustc: Update to 0.8.1.

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 38106-done@debbugs.gnu.org)

Message-ID:20200121212359.64d6f948@scratchpost.org

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.

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl4nXd8ACgkQ5xo1VCww

uqUVHQf+KP+cFXqwAuKUnVlFcQRB/goeW9oEttlgeOqEea5j/S+oPIPvKt6uvmKA

Sah121yX3WqE/Gk19S6fWmKoa/g3WokXQN1E/eZNLOHCGgkl4piz3C0JgE+4I9Bj

g4RhtM2IstolwLYH6Z1j/f9RfZfYQ5DSMkYkcgh2tWMxO+XpYtIW2sEAT8ya72de

qzi2xXZHsvJJov3hP89DUSf6Lh+VuCVWnhQy13Qq2q9ZYnyPS8QphxSxWuX2kVT8

KRHC5mGomQgBcQeWDwqnfI2NGFyXRZQvj6bjVR5+TtZzpi+FoPc/uqLKDgf1Wl/r

zQnCVxlTdtVkBd/YII5bCYjGaPYxoQ==

=8Oqh

-----END PGP SIGNATURE-----

Closed

Marius Bakke wrote 5 years ago

Recipients:(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 38106-done@debbugs.gnu.org)

Message-ID:87tv4ots4p.fsf@devup.no

Danny Milosavljevic <dannym@scratchpost.org> writes:

Toggle quote (10 lines)> 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. :-)

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 38106@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 38106

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date