From patchwork Wed Apr 29 09:40:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 21751 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D869C27BBE4; Wed, 29 Apr 2020 10:41:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::17]) by mira.cbaines.net (Postfix) with ESMTP id 99DBA27BBE1 for ; Wed, 29 Apr 2020 10:41:11 +0100 (BST) Received: from localhost ([::1]:38242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTjDL-0006YY-5W for patchwork@mira.cbaines.net; Wed, 29 Apr 2020 05:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTjDF-0006YE-HV for guix-patches@gnu.org; Wed, 29 Apr 2020 05:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTjDF-0001p8-6b for guix-patches@gnu.org; Wed, 29 Apr 2020 05:41:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59135) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTjDC-0001n4-Ms for guix-patches@gnu.org; Wed, 29 Apr 2020 05:41:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jTjDC-0006VU-IY for guix-patches@gnu.org; Wed, 29 Apr 2020 05:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40957] [PATCH 1/?] gnu: rust: Add 1.40 Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Apr 2020 09:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40957 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40957@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158815325724993 (code B ref -1); Wed, 29 Apr 2020 09:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2020 09:40:57 +0000 Received: from localhost ([127.0.0.1]:42448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTjD7-0006V3-FL for submit@debbugs.gnu.org; Wed, 29 Apr 2020 05:40:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:43522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jTjD5-0006Uv-Md for submit@debbugs.gnu.org; Wed, 29 Apr 2020 05:40:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34870) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTjD5-0006Xn-69 for guix-patches@gnu.org; Wed, 29 Apr 2020 05:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTjD4-0000r4-5K for guix-patches@gnu.org; Wed, 29 Apr 2020 05:40:54 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:49548) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTjD3-00007A-FX for guix-patches@gnu.org; Wed, 29 Apr 2020 05:40:53 -0400 Received: (qmail 25337 invoked by uid 1009); 29 Apr 2020 11:40:41 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25796. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.00865 secs); 29 Apr 2020 09:40:41 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 29 Apr 2020 11:40:41 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 29 Apr 2020 11:40:21 +0200 Message-Id: <20200429094022.22294-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Qmailux-2.08st: added fake Content-Type header Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 05:40:45 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)