From patchwork Mon Mar 28 18:43:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 38163 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 1423E27BBEA; Mon, 28 Mar 2022 19:44:56 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 CE0BD27BBE9 for ; Mon, 28 Mar 2022 19:44:55 +0100 (BST) Received: from localhost ([::1]:53828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYuMI-0000vb-OZ for patchwork@mira.cbaines.net; Mon, 28 Mar 2022 14:44:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYuLS-0000uC-Ak for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYuLR-0006Qt-Kj for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nYuLR-0001WE-J0 for guix-patches@gnu.org; Mon, 28 Mar 2022 14:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54615] [PATCH 1/2] gnu: spike: Substitute path to dtc instead of wrapping executables. References: <20220328184117.25158-1-arunisaac@systemreboot.net> In-Reply-To: <20220328184117.25158-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Mar 2022 18:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54615@debbugs.gnu.org Cc: Arun Isaac , Efraim Flashner Received: via spool by 54615-submit@debbugs.gnu.org id=B54615.16484930065782 (code B ref 54615); Mon, 28 Mar 2022 18:44:01 +0000 Received: (at 54615) by debbugs.gnu.org; 28 Mar 2022 18:43:26 +0000 Received: from localhost ([127.0.0.1]:59195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYuKr-0001VA-VY for submit@debbugs.gnu.org; Mon, 28 Mar 2022 14:43:26 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:51780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYuKq-0001Uv-8K for 54615@debbugs.gnu.org; Mon, 28 Mar 2022 14:43:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Hikk2s2WOCJriNhOiBAW9g6iWECrb84FDWks6/SENCc=; b=C+nRRd+grwwdb2iRyztzErbEgs FieT0IoeKqOv7HUOGdaM/+S6EOWkDyP/iOKGhPP1VrWv9IzOcuUl4hF5Umw08iv1nYYK+/pc+a0l9 Lf7EuHAlkEgagSjTPx+X/XTbALVAIj76r15mlDAIzAdovbduWI7Osm1OIIbeKxb0ynEwYwOLXZH1c tzQVKUW4kULSRVrk5HBxSwCYKDEEbCKDGQdJbyOYI3DYPiVkZmLx5HYAwK48QgyIZGDJFo1sCAu8i 8CXJmpT9/SwlknhKKwqlicwCYlcGoWbq71IEmTMlo4iCLI+CVkcDD3ElI4bBsg4kV6TZPb0oPJB38 GvVi9KIg==; Received: from [192.168.2.1] (port=7222 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1nYuKn-000OKi-3A; Tue, 29 Mar 2022 00:13:21 +0530 From: Arun Isaac Date: Tue, 29 Mar 2022 00:13:18 +0530 Message-Id: <20220328184319.25281-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.34.0 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 * gnu/packages/virtualization.scm (spike)[arguments]: Delete the wrap-binary phase. Add a configure-dtc-path phase that substitutes the absolute path to dtc. --- gnu/packages/virtualization.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index bd297977df..9c86670ce7 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov ;;; Copyright © 2022 Ekaitz Zarraga +;;; Copyright © 2022 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1037,15 +1038,12 @@ (define-public spike (list #:phases #~(modify-phases %standard-phases - (add-after 'install 'wrap-binary - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (file) - (wrap-program file - `("PATH" ":" prefix - (,(dirname (search-input-file inputs "/bin/dtc")))))) - (find-files (string-append out "/bin"))))))))) + (add-before 'configure 'configure-dtc-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Reference dtc by its absolute store path. + (substitute* "riscv/dts.cc" + (("DTC") + (string-append "\"" (assoc-ref inputs "dtc") "/bin/dtc\"")))))))) (inputs (list bash-minimal dtc)) (native-inputs