| Message ID | 20191107181949.24679-1-dannym@scratchpost.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#38106] gnu: mrustc: Update to 0.8.1. | expand |
Hi, Danny Milosavljevic <dannym@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’.
Ludovic Courtès <ludo@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.
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'?
Hi Marius, On Sun, 19 Jan 2020 22:36:24 +0100 Marius Bakke <mbakke@fastmail.com> wrote: > 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).
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 .
> 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)
Pushed to guix staging as commit 400a4d65acde14182fd9741d8a46ed5a6e8fd1d7 after extensive testing on bayfront. Commit 84800833eac3fd92e685d7977f3b4b06fc32aa44 cleans up mrustc a bit.
Danny Milosavljevic <dannym@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
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.
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.
Danny Milosavljevic <dannym@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. :-)
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