From patchwork Thu Jan 28 23:31:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 26713 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 B8CFC27BC1D; Thu, 28 Jan 2021 23:32:23 +0000 (GMT) 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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 0268927BC1C for ; Thu, 28 Jan 2021 23:32:23 +0000 (GMT) Received: from localhost ([::1]:40568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l5Gly-000827-7G for patchwork@mira.cbaines.net; Thu, 28 Jan 2021 18:32:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l5Gle-00081q-II for guix-patches@gnu.org; Thu, 28 Jan 2021 18:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l5Gle-00089y-BD for guix-patches@gnu.org; Thu, 28 Jan 2021 18:32:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l5Gle-0001oP-8H for guix-patches@gnu.org; Thu, 28 Jan 2021 18:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46163] [PATCH] staging gnu: Add wasm32 target to rustc. Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Jan 2021 23:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46163 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46163@debbugs.gnu.org Received: via spool by 46163-submit@debbugs.gnu.org id=B46163.16118766886917 (code B ref 46163); Thu, 28 Jan 2021 23:32:02 +0000 Received: (at 46163) by debbugs.gnu.org; 28 Jan 2021 23:31:28 +0000 Received: from localhost ([127.0.0.1]:50596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5Gl5-0001nU-Rs for submit@debbugs.gnu.org; Thu, 28 Jan 2021 18:31:28 -0500 Received: from mail-pj1-f50.google.com ([209.85.216.50]:36362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l5Gl3-0001nH-GI for 46163@debbugs.gnu.org; Thu, 28 Jan 2021 18:31:25 -0500 Received: by mail-pj1-f50.google.com with SMTP id gx1so5315913pjb.1 for <46163@debbugs.gnu.org>; Thu, 28 Jan 2021 15:31:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=m9csjtOnVdpdcd+S23+zFHUJiQsrn9PFdueR3XEFs+k=; b=A5qruHFrF0cAJacZg6gylsEGG/7q2g0/lRw52JX8EedJhi6nOpDoziYE35IHIRed13 609TotOvuFU7cRL1MSuLtJ1G2YGmJDotPtwmOJXww4F0XUcbpjzTbgFKDXwtY9QnVann Q0RB7aDrZyyuLknBNNb2dEc2osfkPjF/Xsd5VobaC2epwzoH4T55PUCF5C0vv5oT53nz or4nptW3FAkqVwLUeEZQVntEcDA1YyPGncziJ2bCkobLvHeC7R37HQ1TJI46VVA0gr/f xe4h75ObSf9xKrimL1WWnMpMTElooUzETNQ9EzF5t6dCPZ11jpvIDkTfMf8fLKJH+k+c 77NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=m9csjtOnVdpdcd+S23+zFHUJiQsrn9PFdueR3XEFs+k=; b=Hf1aXCrOCQZ6qRfuoy94pS8nOdlC7bpNlMphsjT1p6pOiX9wtFPEPuvialMpf6JX4h +0jc1odoQfgsw2QwQyxIVRZM7GbVrpt3T6x95F8yG+pJ/3lxw8CcX5Hc/Jpk2OgVIr/C JkKONhdQ4HRU+zF/6js0d0x6H2Ho9ez6x2SZabd2qo58aTnRqZnO5qW55UWaGsZcbfY9 VL3dLvuOUw5jWZgPiLDoe1TJpPZVfjHyBicIGezjJp6gCC+jH0FGBXivO0riewek20Pm roVXtUt5sKfqFC3SnOvsUjFmIhZXjF974gjTy90VeSlEnLR78LFPmu212zInzBuxDHwV chbg== X-Gm-Message-State: AOAM531Qhzoeetrn4qnIL+peeCbAD17fY8Gejtm9HzUK3qV73PtJrzU9 YtQ8HR1At5nvcUEhZqk5BK3dzL3oFntYWQ== X-Google-Smtp-Source: ABdhPJym/ukshmvXB2jyTBT65mSiiqtMPscmLeGKEYSkkuAA5K13DUC3rAyv6P8BS0H/RohihjIDnQ== X-Received: by 2002:a17:90b:1956:: with SMTP id nk22mr1631252pjb.17.1611876679685; Thu, 28 Jan 2021 15:31:19 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id o13sm6967706pfp.101.2021.01.28.15.31.18 for <46163@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Jan 2021 15:31:18 -0800 (PST) From: John Soo References: <87bld8k9bn.fsf@asu.edu> Date: Thu, 28 Jan 2021 15:31:17 -0800 In-Reply-To: <87bld8k9bn.fsf@asu.edu> (John Soo's message of "Thu, 28 Jan 2021 14:03:56 -0800") Message-ID: <8735ykk5a2.fsf@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 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 Here is a fixed patch, I had rebased incorrectly. Thanks again! - John From d987b267c202f985808a19ebcb98ea5845a3a241 Mon Sep 17 00:00:00 2001 From: John Soo Date: Sat, 23 Jan 2021 08:43:52 -0800 Subject: [PATCH] gnu: Add wasm32 target to rust@1.46. * gnu/packages/rust.scm (rust-1.46): [arguments] Add wasm32 to target configuration, [native-inputs] Add node for tests. --- gnu/packages/rust.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index b59fe98546..7b40372cb2 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages jemalloc) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages node) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ssh) @@ -1329,7 +1330,8 @@ move around." `(("gcc-lib" ,gcc "lib") ,@(package-inputs base-rust))) (native-inputs - `(("patchelf" ,patchelf) + `(("node" ,node) + ("patchelf" ,patchelf) ,@(package-native-inputs base-rust))) (arguments (substitute-keyword-arguments (package-arguments base-rust) @@ -1347,7 +1349,21 @@ move around." (generate-all-checksums "vendor") #t)) (replace 'build - (lambda* _ + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "config.toml" + (("\\[build\\]" all) + (string-append all " +target = [\"" ,(nix-system->gnu-triplet-for-rust) "\", \"wasm32-unknown-unknown\"] +")) + (("\\[dist\\]" all) + (string-append " +[target.wasm32-unknown-unknown] +llvm-config = \"" (assoc-ref inputs "llvm") "/bin/llvm-config\" +cc = \"" (assoc-ref inputs "gcc") "/bin/gcc\" +cxx = \"" (assoc-ref inputs "gcc") "/bin/g++\" +ar = \"" (assoc-ref inputs "binutils") "/bin/ar\" +" +all))) (invoke "./x.py" "build") (invoke "./x.py" "build" "src/tools/cargo") (invoke "./x.py" "build" "src/tools/rustfmt") @@ -1362,7 +1378,9 @@ move around." (string-append "-j" (number->string (min 4 (parallel-job-count)))))) - (invoke "./x.py" parallel-job-spec "test" "-vv") + (invoke "./x.py" parallel-job-spec "test" + (string-append "--target=" ,(nix-system->gnu-triplet-for-rust)) + "-vv") (invoke "./x.py" parallel-job-spec "test" "src/tools/cargo") (invoke "./x.py" parallel-job-spec "test" -- 2.30.0