From: Danny Milosavljevic <dannym@scratchpost.org>
To: 38110@debbugs.gnu.org
Cc: Danny Milosavljevic <dannym@scratchpost.org>
Subject: [bug#38110] [PATCH v2 1/2] gnu: mrustc: Update to 0.9.
Date: Fri, 8 Nov 2019 03:46:58 +0100 [thread overview]
Message-ID: <20191108024659.10138-2-dannym@scratchpost.org> (raw)
In-Reply-To: <20191108024659.10138-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.9.
[source](patches): Remove it.
[arguments]<#:phases>[build-minicargo]: Modify.
---
gnu/local.mk | 1 -
....0-fix-variable-length-integer-receiving.patch | 15 ---------------
gnu/packages/rust.scm | 12 +++++-------
3 files changed, 5 insertions(+), 23 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@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..76b1466284 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.9")
(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"))))
+ "194ny7vsks5ygiw7d8yxjmp1qwigd71ilchis6xjl6bb2sj97rd2"))))
(outputs '("out" "cargo"))
(build-system gnu-build-system)
(inputs
@@ -136,7 +134,7 @@
(nix-system->gnu-triplet-for-rust)))))
(invoke "tar" "xf" (assoc-ref inputs "rustc"))
(chdir "rustc-1.19.0-src")
- (invoke "patch" "-p0" "../rust_src.patch")
+ (invoke "patch" "-p0" "../rustc-1.19.0-src.patch")
(chdir "..")
#t))
(replace 'configure
@@ -147,8 +145,8 @@
(lambda _
(for-each (lambda (target)
(invoke "make" "-f" "minicargo.mk" target))
- '("output/libstd.hir" "output/libpanic_unwind.hir"
- "output/libproc_macro.hir" "output/libtest.hir"))
+ '("output/libstd.rlib" "output/libpanic_unwind.rlib"
+ "output/libproc_macro.rlib" "output/libtest.rlib"))
;; Technically the above already does it - but we want to be clear.
(invoke "make" "-C" "tools/minicargo")))
(replace 'install
next prev parent reply other threads:[~2019-11-08 2:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 22:27 [bug#38110] [PATCH 0/2] Bootstrap rust@1.29.0 directly from mrustc@0.9 Danny Milosavljevic
2019-11-07 22:29 ` [bug#38110] [PATCH 1/2] gnu: mrustc: Update to 0.9 Danny Milosavljevic
2019-11-07 22:30 ` [bug#38110] [PATCH 2/2] gnu: rust: Bootstrap rust@1.29.0 from mrustc Danny Milosavljevic
2019-11-07 23:18 ` Danny Milosavljevic
2019-11-07 23:17 ` [bug#38110] [PATCH 1/2] gnu: mrustc: Update to 0.9 Danny Milosavljevic
2019-11-08 2:46 ` [bug#38110] [PATCH v2 0/2] Bootstrap rust@1.29.0 directly from mrustc@0.9 Danny Milosavljevic
2019-11-08 2:46 ` Danny Milosavljevic [this message]
2019-11-08 22:47 ` [bug#38110] [PATCH v2 1/2] gnu: mrustc: Update to 0.9 Ludovic Courtès
2019-11-08 2:46 ` [bug#38110] [PATCH v2 2/2] gnu: rust: Bootstrap rust@1.29.0 by mrustc@0.9 Danny Milosavljevic
2019-11-08 22:50 ` Ludovic Courtès
2020-03-15 14:20 ` Marius Bakke
2020-03-15 19:23 ` Danny Milosavljevic
2020-01-19 22:19 ` [bug#38110] [PATCH v2 0/2] Bootstrap rust@1.29.0 directly from mrustc@0.9 Danny Milosavljevic
2020-01-21 0:15 ` Danny Milosavljevic
2020-03-15 19:23 ` [bug#38110] [PATCH core-updates v3] gnu: rust: Bootstrap rust@1.29.0 by mrustc@0.9 Danny Milosavljevic
2020-03-19 23:58 ` Jakub Kądziołka
2020-03-20 16:11 ` Marius Bakke
2020-03-23 21:24 ` Danny Milosavljevic
2020-03-23 22:16 ` Marius Bakke
2020-03-24 11:57 ` Danny Milosavljevic
2020-03-24 14:45 ` Marius Bakke
2020-12-10 21:55 ` Maxim Cournoyer
2021-02-05 14:58 ` bug#38110: [PATCH 0/2] Bootstrap rust@1.29.0 directly from mrustc@0.9 Maxim Cournoyer
2020-03-20 16:18 ` [bug#38110] [PATCH core-updates v3] gnu: rust: Bootstrap rust@1.29.0 by mrustc@0.9 Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191108024659.10138-2-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=38110@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.