From: "Jakub Kądziołka" <kuba@kadziolka.net>
To: 40957@debbugs.gnu.org
Subject: [bug#40957] [PATCH 1/?] gnu: rust: Add 1.40
Date: Wed, 29 Apr 2020 11:40:21 +0200 [thread overview]
Message-ID: <20200429094022.22294-1-kuba@kadziolka.net> (raw)
* gnu/packages/rust.scm (rust-1.40): New variable.
---
gnu/packages/rust.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
Debbugs note: I will send patches to add more versions to this bug
number as I get them to work.
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 11522b933e..a82bfa5912 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1176,4 +1176,38 @@ move around."
(generate-all-checksums "vendor")
#t)))))))))
+(define-public rust-1.40
+ (let ((base-rust
+ (rust-bootstrapped-package rust-1.39 "1.40.0"
+ "1ba9llwhqm49w7sz3z0gqscj039m53ky9wxzhaj11z6yg1ah15yx")))
+ (package
+ (inherit base-rust)
+ (source
+ (origin
+ (inherit (package-source base-rust))
+ ;; llvm-emscripten is no longer bundled, as that codegen backend
+ ;; got removed.
+ (snippet '(begin
+ (delete-file-recursively "src/llvm-project")
+ (delete-file-recursively "vendor/jemalloc-sys/jemalloc")
+ #t))))
+ (arguments
+ ;; Rust 1.40 does not ship rustc-internal libraries by default
+ ;; (see rustc-dev-split). This means that librustc_driver.so is no
+ ;; longer available in lib/rustlib/$target/lib, which is the directory
+ ;; included in the runpath of librustc_codegen_llvm-llvm.so.
+ ;; This is detected by our validate-runpath phase as an error, but it
+ ;; is harmless as the codegen backend is loaded by librustc_driver.so
+ ;; itself, which must at that point have been already loaded.
+ ;; As such, we skip validating the runpath for Rust 1.40.
+ ;; Rust 1.41 stopped putting the codegen backend in a separate library,
+ ;; which makes this workaround only necessary for this release.
+ (cons* #:validate-runpath? #f
+ (substitute-keyword-arguments (package-arguments base-rust)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ ;; The test got removed in commit 000fe63b6fc57b09828930cacbab20c2ee6e6d15
+ ;; "Remove painful test that is not pulling its weight"
+ (delete 'remove-unsupported-tests)))))))))
+
(define-public rust rust-1.37)
--
2.26.2
next reply other threads:[~2020-04-29 9:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 9:40 Jakub Kądziołka [this message]
2020-04-29 16:02 ` [bug#40957] [PATCH 2/?] gnu: rust: Add 1.41 Jakub Kądziołka
2020-06-20 20:44 ` [bug#40957] [PATCH v2 1/2] gnu: llvm-9: Backport patches to fix miscompilations Jakub Kądziołka
2020-06-20 20:44 ` [bug#40957] [PATCH v2 2/2] gnu: rust: Bootstrap up to rustc 1.44 Jakub Kądziołka
2020-07-01 6:14 ` [bug#40957] [PATCH 1/?] gnu: rust: Add 1.40 John Soo
2020-07-02 23:41 ` bug#40957: " 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=20200429094022.22294-1-kuba@kadziolka.net \
--to=kuba@kadziolka.net \
--cc=40957@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.