From patchwork Mon Aug 15 23:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Wicki X-Patchwork-Id: 41701 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 67A5927BBE9; Tue, 16 Aug 2022 00:59:10 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 D342327BBEA for ; Tue, 16 Aug 2022 00:59:09 +0100 (BST) Received: from localhost ([::1]:57462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNjzB-0001gQ-05 for patchwork@mira.cbaines.net; Mon, 15 Aug 2022 19:59:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjz4-0001gI-UE for guix-patches@gnu.org; Mon, 15 Aug 2022 19:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54600) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNjz4-00081y-Km for guix-patches@gnu.org; Mon, 15 Aug 2022 19:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNjz4-00032g-Em for guix-patches@gnu.org; Mon, 15 Aug 2022 19:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57234] Fix build of package icestorm Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Aug 2022 23:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 57234@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166060790611650 (code B ref -1); Mon, 15 Aug 2022 23:59:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Aug 2022 23:58:26 +0000 Received: from localhost ([127.0.0.1]:44349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNjyU-00031q-9Q for submit@debbugs.gnu.org; Mon, 15 Aug 2022 19:58:26 -0400 Received: from lists.gnu.org ([209.51.188.17]:33988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNjyP-00031f-Kk for submit@debbugs.gnu.org; Mon, 15 Aug 2022 19:58:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjyP-0001ea-Fl for guix-patches@gnu.org; Mon, 15 Aug 2022 19:58:21 -0400 Received: from chimborazo.ee.ethz.ch ([129.132.2.15]:50509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjyN-0007zP-DA for guix-patches@gnu.org; Mon, 15 Aug 2022 19:58:21 -0400 Received: from silvi (unknown [85.195.207.206]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id E72984011F for ; Tue, 16 Aug 2022 01:58:14 +0200 (CEST) Date: Tue, 16 Aug 2022 01:58:11 +0200 From: Gabriel Wicki Message-ID: <20220815235811.5mlvvl2mbsoa2lzb@silvi> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: pass client-ip=129.132.2.15; envelope-from=gabriel@erlikon.ch; helo=chimborazo.ee.ethz.ch X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hello! I noticed icestorm doesn't build currently. I've attached a fix. TIA for merging soon ;) g From de5b7f58c5c18621f69d15e11d78349c0d2d18be Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Tue, 16 Aug 2022 01:46:07 +0200 Subject: [PATCH] gnu: fpga: Fix build of icestorm * gnu/packages/fpga.scm (icestorm): Fix build. [phases]{fix-build}: New phase. --- gnu/packages/fpga.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index b8f98ca63e..cac4db318d 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -258,6 +258,11 @@ (define-public icestorm (substitute* "icebox/icebox_vlog.py" (("/usr/local/share") (string-append (assoc-ref outputs "out") "/share"))) #t)) + (add-after 'fix-usr-local 'fix-build + (lambda _ + (substitute* "icetime/icetime.cc" + (("#include ") + "#include \n#include ")))) (delete 'configure)))) (inputs (list libftdi))