From patchwork Mon Jul 24 05:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fries X-Patchwork-Id: 15203 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 1CA5727BBEA; Mon, 24 Jul 2023 08:32:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EFA1927BBE2 for ; Mon, 24 Jul 2023 08:32:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNq27-0001Ho-Qx; Mon, 24 Jul 2023 03:31:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNq26-0001GW-B0 for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNq26-00070m-2X for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNq24-00072j-Uo for guix-patches@gnu.org; Mon, 24 Jul 2023 03:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64804] [PATCH 2/5] gnu: rust: Add rust-1.70. Resent-From: Fries Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 07:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64804 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64804@debbugs.gnu.org Cc: Fries , efraim@flashner.co.il, juli@incana.org Received: via spool by 64804-submit@debbugs.gnu.org id=B64804.169018383026952 (code B ref 64804); Mon, 24 Jul 2023 07:31:04 +0000 Received: (at 64804) by debbugs.gnu.org; 24 Jul 2023 07:30:30 +0000 Received: from localhost ([127.0.0.1]:41626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNq1R-00070U-S4 for submit@debbugs.gnu.org; Mon, 24 Jul 2023 03:30:30 -0400 Received: from mail-40132.protonmail.ch ([185.70.40.132]:28141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNoFV-0003zL-RJ for 64804@debbugs.gnu.org; Mon, 24 Jul 2023 01:36:55 -0400 Date: Mon, 24 Jul 2023 05:36:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690177001; x=1690436201; bh=Z5LddtNf0zmmVqhTAFUG726IDD1il1sjdTSQhVZomcs=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Ur2Yzc6OgCNcFCKoaKTWJmo7xiNlehrzNRVgxNKsHRHDpz67OTiweErnoFaos/Bkq ji3yvC9MLm0T3we0o0UnzAiDTPqr8NGPJqrvlbfCcLu01+Ld08CbkUT7wZ399vpr4v CJiM5OEURNi7jq7GRJ0q2I8KmcTx8C3nhGoefbO1c5lJFSjwMfI6d/Ua8CbjUIk7Qn s3EPVs6n0jYjkU/aDXGrCiDxRW7iCy19PhsZ9pQjajgLhVPBIublHN3ez5cC4ad4xa mTFfI8uJX5KFDBSrFGQAEGi1CxaqUqJdsgnnYe4neJBPlNzBLyXMdIomf7QosxJlCr yHYtcUYRCWgVA== Message-ID: <7e849ca25c4cceb184058d3a897c5462896d5695.1690176958.git.fries1234@protonmail.com> In-Reply-To: References: Feedback-ID: 42759890:user:proton MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 24 Jul 2023 03:30:09 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Fries X-ACL-Warn: , Fries via Guix-patches X-Patchwork-Original-From: Fries via Guix-patches via From: Fries Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/rust.scm (rust-1.70): New variable. --- .../patches/rust-1.70-fix-rustix-build.patch | 20 +++++++++++++++++++ gnu/packages/rust.scm | 16 +++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gnu/packages/patches/rust-1.70-fix-rustix-build.patch diff --git a/gnu/packages/patches/rust-1.70-fix-rustix-build.patch b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch new file mode 100644 index 0000000000..a7e2003aff --- /dev/null +++ b/gnu/packages/patches/rust-1.70-fix-rustix-build.patch @@ -0,0 +1,20 @@ +--- a/vendor/fd-lock/Cargo.toml 2023-05-31 14:44:48.000000000 -0700 ++++ b/vendor/fd-lock/Cargo.toml 2023-07-14 21:19:34.637702319 -0700 +@@ -45,7 +45,7 @@ + + [target."cfg(unix)".dependencies.rustix] + version = "0.37.0" +-features = ["fs"] ++features = ["fs", "cc"] + + [target."cfg(windows)".dependencies.windows-sys] + version = "0.45.0" +--- a/src/bootstrap/Cargo.lock 2023-07-11 20:32:40.000000000 -0700 ++++ b/src/bootstrap/Cargo.lock 2023-07-14 22:41:53.269284713 -0700 +@@ -618,6 +618,7 @@ + dependencies = [ + "bitflags", ++ "cc", + "errno", + "io-lifetimes", + "libc", diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index c0738a6064..0b9afd3ea9 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -724,6 +724,22 @@ (define rust-1.69 (for-each delete-file (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))))) +(define rust-1.70 + (let ((base-rust + (rust-bootstrapped-package + rust-1.69 "1.70.0" "0z6j7d0ni0rmfznv0w3mrf882m11kyh51g2bxkj40l3s1c0axgxj"))) + (package + (inherit base-rust) + (source + (origin + (inherit (package-source base-rust)) + ;; Rust 1.70 adds the rustix library which depends on the vendored fd-lock + ;; crate. The fd-lock crate uses Outline assembly which expects a precompiled + ;; static library. Enabling the "cc" feature tells the build.rs script to + ;; compile the assembly files instead of searching for a precompiled library. + (patches (search-patches "rust-1.70-fix-rustix-build.patch")) + (patch-flags '("-p1"))))))) + ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time