From patchwork Fri Feb 10 13:16:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46782 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 C603F165C3; Fri, 10 Feb 2023 13:18:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 0F71A164D1 for ; Fri, 10 Feb 2023 13:18:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQTIA-0003Lw-Cy; Fri, 10 Feb 2023 08:18:18 -0500 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 1pQTHw-0003KM-Ic for guix-patches@gnu.org; Fri, 10 Feb 2023 08:18:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQTHu-0003v6-Qz for guix-patches@gnu.org; Fri, 10 Feb 2023 08:18:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQTHu-0003Ve-ND for guix-patches@gnu.org; Fri, 10 Feb 2023 08:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60429] [PATCH v3 4/5] gnu: yosys: Do not propagate any inputs. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Feb 2023 13:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60429@debbugs.gnu.org Received: via spool by 60429-submit@debbugs.gnu.org id=B60429.167603502713407 (code B ref 60429); Fri, 10 Feb 2023 13:18:02 +0000 Received: (at 60429) by debbugs.gnu.org; 10 Feb 2023 13:17:07 +0000 Received: from localhost ([127.0.0.1]:34482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQTH0-0003U6-JI for submit@debbugs.gnu.org; Fri, 10 Feb 2023 08:17:07 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:38968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQTGy-0003TG-B0 for 60429@debbugs.gnu.org; Fri, 10 Feb 2023 08:17:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 715E3E87D1 for <60429@debbugs.gnu.org>; Fri, 10 Feb 2023 13:16:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l9zLtOBPBi6w for <60429@debbugs.gnu.org>; Fri, 10 Feb 2023 13:16:58 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0E886E881B for <60429@debbugs.gnu.org>; Fri, 10 Feb 2023 13:16:58 +0000 (UTC) From: Simon South Date: Fri, 10 Feb 2023 08:16:54 -0500 Message-Id: <2341e855934118580304aaf92195878fc6c71dff.1676033083.git.simon@simonsouth.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fpga.scm (yosys)[arguments]<#:phases>: Patch reference to z3 in "fix-paths" phase; in "use-external-abc" phase, use complete path to "abc" executable in store. [propagated-inputs]: Remove, moving abc and z3 from here... [inputs]: ...to here. --- gnu/packages/fpga.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 7b3c522bf7..4a01714e81 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -159,6 +159,9 @@ (define-public yosys #~(modify-phases %standard-phases (add-before 'configure 'fix-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "./backends/smt2/smtio.py" + (("\\['z3") + (string-append "['" (search-input-file inputs "/bin/z3")))) (substitute* "./passes/cmds/show.cc" (("exec xdot") (string-append "exec " (search-input-file inputs @@ -171,9 +174,11 @@ (define-public yosys (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "make" "config-gcc" make-flags))) (add-after 'configure 'use-external-abc - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("./Makefile") - (("ABCEXTERNAL \\?=") "ABCEXTERNAL = abc")))) + (("ABCEXTERNAL \\?=") + (string-append "ABCEXTERNAL = " + (search-input-file inputs "/bin/abc")))))) (add-before 'check 'fix-iverilog-references (lambda* (#:key inputs native-inputs #:allow-other-keys) (let ((iverilog (search-input-file (or native-inputs inputs) @@ -211,15 +216,14 @@ (define-public yosys python tcl)) ; tclsh for the tests (inputs - (list graphviz + (list abc + graphviz libffi psmisc readline tcl - xdot)) - (propagated-inputs - (list abc - z3)) ; should be in path for yosys-smtbmc + xdot + z3)) (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") (description "Yosys synthesizes Verilog-2005.")