From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59771) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iSqJ2-0000rf-7z for guix-patches@gnu.org; Thu, 07 Nov 2019 17:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iSqIx-0000m8-LI for guix-patches@gnu.org; Thu, 07 Nov 2019 17:31:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iSqIx-0000lW-H4 for guix-patches@gnu.org; Thu, 07 Nov 2019 17:31:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iSqIw-000506-CX for guix-patches@gnu.org; Thu, 07 Nov 2019 17:31:03 -0500 Subject: [bug#38110] [PATCH 1/2] gnu: mrustc: Update to 0.9. Resent-Message-ID: From: Danny Milosavljevic Date: Thu, 7 Nov 2019 23:29:59 +0100 Message-Id: <20191107223000.20242-1-dannym@scratchpost.org> In-Reply-To: <20191107222756.20064-1-dannym@scratchpost.org> References: <20191107222756.20064-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38110@debbugs.gnu.org Cc: Danny Milosavljevic * 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: Update to 0.9. [source](patches): Remove it. --- gnu/local.mk | 1 - ...fix-variable-length-integer-receiving.patch | 15 --------------- gnu/packages/rust.scm | 18 ++++++++---------- 3 files changed, 8 insertions(+), 26 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 -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(b) << ofs; -+ v |= static_cast(b & 0x7F) << ofs; - if( (b & 0x80) == 0 ) - break; - ofs += 7; diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index f3fee4c126..a752f9ece4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -88,10 +88,10 @@ (package-native-inputs base-rust)))))) (define-public mrustc - (let ((rustc-version "1.19.0")) + (let ((rustc-version "1.29.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 @@ -111,7 +109,7 @@ `(("bison" ,bison) ("flex" ,flex) ;; Required for the libstd sources. - ("rustc" ,(package-source rust-1.19)))) + ("rustc" ,(package-source rust-1.29)))) (arguments `(#:test-target "local_tests" #:make-flags (list (string-append "LLVM_CONFIG=" @@ -135,8 +133,8 @@ ,(or (%current-target-system) (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") + (chdir "rustc-1.29.0-src") + (invoke "patch" "-p0" "../rustc-1.29.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