From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ME1TFszd+mIpIAAAbAwnHQ (envelope-from ) for ; Tue, 16 Aug 2022 01:59:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4CRUFczd+mL0AAEAG6o9tA (envelope-from ) for ; Tue, 16 Aug 2022 01:59:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 25A5A13E6 for ; Tue, 16 Aug 2022 01:59:08 +0200 (CEST) Received: from localhost ([::1]:57462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNjz9-0001gQ-94 for larch@yhetil.org; Mon, 15 Aug 2022 19:59:07 -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-Type: text/plain; charset=us-ascii 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660607948; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post; bh=tDPmAECaNrSIvVsaOW5W/GRP0Gv0Dd1oNQ/6HKaWOcs=; b=Qq/S51sK4rb16qvgpbIKqI6h9xJEXF9RPEEaHE59uaPn2riy1HWu+Gt6H2Ea/mMgTEjhkO gi7PPpouvh8xvbE8ySUfOibYnwN5VRd+N45vX359lNTQZX4I6lGGmc0JJo0hZp7T0N+d08 nQiFw/VJBqjBNNohalbeeyCFY8rPy7o4HxfhKqvUfhUSF0eB90Xu3DVQNhp/0YeoiIZIZR 6yd6IaBogFzrSL4dQN1t1W2PZCftYITLVPztemgURS/czR6O3+fHGKlIrqnZ8THEp0NQg7 +gsOdLGyvd4PlyQA8pk7Ovor0FuA/093EB9ivWtpVqDZDp3tPegnGmjSXgftew== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660607948; a=rsa-sha256; cv=none; b=RCp3puEu/lZgI0bcbL1nupMClbwdqrlYef6HZ1r6nTR2IIQpEPxTEfv05qOXHaQcNAq2fE qp/33k2zuN4Ezl1vpe4KZ91q1lG0thWg+9TbOBns9PZcYrxZfsG1SEj5Cu0xEndKowj9E/ 4opmaELHl+06AEIwkTYuXC1ISxMFzW5zi8PPSpvg9D1FS7XjiyNuIa3tFtVK0gCXNdY/zP GSKRPmwoVpNLjzobVsEvh2GdVPCbO4oIwWP2q+6cblwY+Ud1xy0SAaYRLw+i/0svjXYFCn wqQWwqsIr0+logAOIoiX3f/hVMDMbMg1uO8G0MQqhKK7WljlnJg0cV1p7JiP7A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.46 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 25A5A13E6 X-Spam-Score: -4.46 X-Migadu-Scanner: scn0.migadu.com X-TUID: bbnpzR/nXFvc 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)) -- 2.36.1