From patchwork Fri Jul 2 10:13:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 31007 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 14A4727BC81; Fri, 2 Jul 2021 11:22:43 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBF3627BC78 for ; Fri, 2 Jul 2021 11:22:42 +0100 (BST) Received: from localhost ([::1]:40958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGJl-00029K-UA for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:22:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzGJA-0001Y9-03 for guix-patches@gnu.org; Fri, 02 Jul 2021 06:22:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzGJ9-00089y-Nr for guix-patches@gnu.org; Fri, 02 Jul 2021 06:22:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzGJ9-0000c3-Kz for guix-patches@gnu.org; Fri, 02 Jul 2021 06:22:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 128/128] gnu: rust: Add 'bash' input for 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.16252213012293 (code B ref 49327); Fri, 02 Jul 2021 10:22:03 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:21:41 +0000 Received: from localhost ([127.0.0.1]:34910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzGIn-0000ap-0J for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:21:41 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:44536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzGIj-0000Zv-FL for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:21:37 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4GGWBW40mVzMqbPK for <49327@debbugs.gnu.org>; Fri, 2 Jul 2021 12:13:39 +0200 (CEST) Received: from localhost.localdomain ([213.119.233.144]) by albert.telenet-ops.be with bizsmtp id QADT2500737benp06ADf3k; Fri, 02 Jul 2021 12:13:39 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:13:24 +0200 Message-Id: <20210702101324.8227-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702101324.8227-1-maximedevos@telenet.be> References: <20210702101324.8227-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220819; bh=hnjV2/CYpVYUsmDCNOQo/ZdizBiXmPseMf8DcCe8cPo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NrgrneD5/QPGYgVNBEVCf8b14d63KuSd7aGG/Ieu/9Y2tOS6NrWK6Jn6NaKmgnWeu 3kSmhW5r+NGqqUfCmto6PnKtxb5LRgb90/fJq4AU9Q5pz1U4n/t3y3GGdBm6RmYMsm V6I8A0mSaz9jJFjh2m/R0EzrlqizhOUxozQ6ybbT3ZiJ+/0h3IsphXRXyIKDuW84uQ pV8v5iqdf/mqwzcGnShB5b2iHPZIwLfh2xCC08BXXFPZt8Sdh2na8ZmIEzJYhhal2o PeyXxMnSq8Hs5/qGQU+qF53MQgFA5pLguSdMe2SCPv053NVmP7rq95WLAk/jh1fOeC UanOYD1IBOdFg== 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches It is required for cross-compilation. * gnu/packages/rust.scm (rust-1.29)[inputs]: Add 'bash-minimal'. (rust-1.30)[inputs]: Likewise. --- gnu/packages/rust.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2d29c2acd7..2cc56bc5aa 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -30,6 +30,7 @@ (define-module (gnu packages rust) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages bootstrap) #:use-module (gnu packages cmake) @@ -154,7 +155,8 @@ (max-silent-time . 18000))) ;5 hours (for armel) (build-system gnu-build-system) (inputs - `(("libcurl" ,curl) + `(("bash" ,bash-minimal) ; for wrap-program + ("libcurl" ,curl) ("libssh2" ,libssh2) ;; Use llvm-7, which enables rust to be built reproducibly. ;; Versions newer than 7 fail to compile. @@ -431,7 +433,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ("cargo-bootstrap" ,rust-1.29 "cargo") ("which" ,which))) (inputs - `(("jemalloc" ,jemalloc-4.5.0) + `(("bash" ,bash-minimal) ; For wrap-program + ("jemalloc" ,jemalloc-4.5.0) ("llvm" ,llvm-7) ("openssl" ,openssl) ("libssh2" ,libssh2) ; For "cargo"