From: Matthew Kraai <kraai@ftbfs.org>
To: 45070@debbugs.gnu.org
Cc: Matthew Kraai <kraai@ftbfs.org>
Subject: [bug#45070] [PATCH] gnu: Add Rust 1.48.
Date: Mon, 7 Dec 2020 14:47:39 -0800 [thread overview]
Message-ID: <20201207224739.13003-1-kraai@ftbfs.org> (raw)
In-Reply-To: <20201206125753.1759-1-kraai@ftbfs.org>
* gnu/packages/rust.scm (rust-1.48): New variable.
---
.../patches/rust-1.48-linker-locale.patch | 14 +++++++++
gnu/packages/rust.scm | 29 +++++++++++++++++++
2 files changed, 43 insertions(+)
create mode 100644 gnu/packages/patches/rust-1.48-linker-locale.patch
diff --git a/gnu/packages/patches/rust-1.48-linker-locale.patch b/gnu/packages/patches/rust-1.48-linker-locale.patch
new file mode 100644
index 0000000000..d06dcbe682
--- /dev/null
+++ b/gnu/packages/patches/rust-1.48-linker-locale.patch
@@ -0,0 +1,14 @@
+https://github.com/rust-lang/rust/pull/74416
+diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
+index 3df956c465e..f45fee45be4 100644
+--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
++++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
+@@ -28,7 +28,7 @@
+ pub fn disable_localization(linker: &mut Command) {
+ // No harm in setting both env vars simultaneously.
+ // Unix-style linkers.
+- linker.env("LC_ALL", "C");
++ linker.env("LC_ALL", "en_US.UTF-8");
+ // MSVC's `link.exe`.
+ linker.env("VSLANG", "1033");
+ }
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 1a79927c45..714d04ba14 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1358,5 +1358,34 @@ move around."
(generate-all-checksums "vendor")
#t)))))))))
+(define-public rust-1.48
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.47 "1.48.0"
+ "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ (patches (search-patches "rust-1.48-linker-locale.patch"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (replace 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "library/std/src/process/tests.rs"
+ ;; The newline is intentional.
+ ;; There's a line length "tidy" check in Rust which would
+ ;; fail otherwise.
+ (("\"/bin/sh\"") (string-append "\n\"" bash "/bin/sh\"")))
+ ;; <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00222.html>
+ (substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
+ (("fn test_process_mask") "#[allow(unused_attributes)]
+ #[ignore]
+ fn test_process_mask"))
+ #t))))))))))
+
;; TODO(staging): Bump this variable to the latest packaged rust.
(define-public rust rust-1.45)
--
2.29.2
next prev parent reply other threads:[~2020-12-07 22:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-06 12:57 [bug#45070] [PATCH] gnu: Add Rust 1.47 Matthew Kraai
[not found] ` <handler.45070.B.160725949418129.ack@debbugs.gnu.org>
2020-12-06 13:44 ` [bug#45070] Acknowledgement ([PATCH] gnu: Add Rust 1.47.) Matthew Kraai
2020-12-07 0:03 ` [bug#45070] [PATCH] gnu: Add Rust 1.47 Matthew Kraai
2020-12-07 22:47 ` Matthew Kraai [this message]
2021-01-03 0:06 ` bug#45070: " Jakub Kądziołka
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=20201207224739.13003-1-kraai@ftbfs.org \
--to=kraai@ftbfs.org \
--cc=45070@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.