From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OBxbAMI11GMuDAEAbAwnHQ (envelope-from ) for ; Fri, 27 Jan 2023 21:36:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aGH7OsE11GOK7wAAG6o9tA (envelope-from ) for ; Fri, 27 Jan 2023 21:36:17 +0100 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 688AD1111D for ; Fri, 27 Jan 2023 21:36:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pLVSE-0007ky-F6; Fri, 27 Jan 2023 15:36:10 -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 1pLVS6-0007eZ-Qa for guix-patches@gnu.org; Fri, 27 Jan 2023 15:36:03 -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 1pLVS6-0004xA-II for guix-patches@gnu.org; Fri, 27 Jan 2023 15:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pLVS6-0006RN-E6 for guix-patches@gnu.org; Fri, 27 Jan 2023 15:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60695] [PATCH v2 8/9] gnu: nextpnr-ice40: Remove bundled software. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Jan 2023 20:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60695@debbugs.gnu.org Received: via spool by 60695-submit@debbugs.gnu.org id=B60695.167485171624696 (code B ref 60695); Fri, 27 Jan 2023 20:36:02 +0000 Received: (at 60695) by debbugs.gnu.org; 27 Jan 2023 20:35:16 +0000 Received: from localhost ([127.0.0.1]:38612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLVRL-0006QF-Tn for submit@debbugs.gnu.org; Fri, 27 Jan 2023 15:35:16 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pLVQw-0006MP-DJ for 60695@debbugs.gnu.org; Fri, 27 Jan 2023 15:34:51 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 76BDDE8516 for <60695@debbugs.gnu.org>; Fri, 27 Jan 2023 20:34:41 +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 mzjgbAgrbKs0 for <60695@debbugs.gnu.org>; Fri, 27 Jan 2023 20:34:41 +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 6EB73E8524 for <60695@debbugs.gnu.org>; Fri, 27 Jan 2023 20:34:37 +0000 (UTC) From: Simon South Date: Fri, 27 Jan 2023 15:34:33 -0500 Message-Id: <3399249f469cb657463e213a8295c62f81d85780.1674850363.git.simon@simonsouth.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674851777; 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: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=gOn1pC7goq3/fmA28+g4ImeDbmZFmWC9nL45c5XS6T4=; b=L1V4QXhDV5cxj7wokSrFVVQRJYcp00JLdHoVnvUR+ld16LocmZCeVHYrq3skTdTMVdLT2n 0mcxvywmbEkMCKYaQ+BSAI9LEXpjO+8uYQSNuHCUw187VEH/si40qadUt/4iLtD7bvPAsQ 22dOfTkP+q21U7h0Pz1j/0xe1OX1n7jWbZ8HMhzIvdWZ42CFZIvdiwRdeh+OLyfNsce3yR ctnTpedN8wMHpvkXsVn477U4MjtrQ4qwsfQLvfgVX7P2LOrxIaqWWR+aji2Z9nly+sga7F UkVQt15veQHMJcC7TGW9kANHmcsLsc9y/RZwm2laVtrgiQcO7KXVxrKd5EJ0Yw== 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674851777; a=rsa-sha256; cv=none; b=jy1IcJGoScp/UCG+NWn86cWnguUXuKb5/OozgQELkAQUzxv1Z+n2trI4G0gHWV7lxt44H4 D9/mWEcRdJwZrHf5VzbTK0sDv2Cd0XTSOfEkYYwU2mvG3rSvzbTp+umQGy37toS5fXqAk7 tf3RR14VqsV8ihZ5i4AxX8xe4ezEm6/R+Ju0lxRHGYzon+N+jCbUs4Q0lW2XbC3S23vCCc xEUGdsy26/UYz9IaYsnu+BKIeuHpKBGwLQS1wfweXYtls0w1qQoov9zKNO6FSUll5MhevA eNo6utcAHoh4pTXi6TAIDdbjqfy0iBEhM/8axlskChuJwR1orTVbGpVEirQCDQ== 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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.67 X-Spam-Score: -1.67 X-Migadu-Queue-Id: 688AD1111D X-TUID: H/on6GzKT4Nt * gnu/packages/fpga.scm (nextpnr-ice40)[source]: Add modules, snippet. [native-inputs]: Add googletest, sanitizers-cmake. [inputs]: Add imgui-1.86, pybind11, qtimgui. [arguments]: Add "patch-source" phase; reformat gently. --- gnu/packages/fpga.scm | 74 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 60a6a143c9..912b6cfb77 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Andrew Miloradovsky ;;; Copyright © 2022 Christian Gelinek ;;; Copyright © 2022 jgart +;;; Copyright © 2023 Simon South ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,10 +37,12 @@ (define-module (gnu packages fpga) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tcl) + #:use-module (gnu packages toolkits) #:use-module (gnu packages readline) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -259,24 +262,77 @@ (define-public nextpnr-ice40 (file-name (git-file-name name version)) (sha256 (base32 - "1llkrh8rk1a1xxzx54apbg49ny2jqzzl2rmbkb8188idipq568ws")))) + "1llkrh8rk1a1xxzx54apbg49ny2jqzzl2rmbkb8188idipq568ws")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove bundled source code for which Guix has packages. + ;; Note the bundled copies of json11 and python-console contain + ;; modifications, while QtPropertyBrowser appears to be + ;; abandoned and without an official source. + (with-directory-excursion "3rdparty" + (for-each delete-file-recursively + '("googletest" "imgui" "pybind11" "qtimgui" + "sanitizers-cmake"))) + + ;; Remove references to unbundled code and link against + ;; external libraries instead. + (substitute* "CMakeLists.txt" + (("^\\s+add_subdirectory\\(3rdparty/googletest.*") "") + (("^(\\s+target_link_libraries.*)( gtest_main\\))" + _ prefix suffix) + (string-append prefix " gtest" suffix))) + (substitute* "gui/CMakeLists.txt" + (("^\\s+../3rdparty/(qt)?imgui.*") "") + (("^(target_link_libraries.*)\\)" _ prefix) + (string-append prefix " imgui qt_imgui_widgets)"))))))) + (native-inputs + (list googletest sanitizers-cmake)) (inputs (list boost eigen icestorm + imgui-1.86 + pybind11 python qtbase-5 + qtimgui yosys)) (build-system cmake-build-system) (arguments - (list #:configure-flags - #~(list "-DARCH=ice40" - "-DBUILD_TESTS=ON" - (string-append "-DCURRENT_GIT_VERSION=" - #$(string-take commit 8)) - (string-append "-DICEBOX_ROOT=" - #$(this-package-input "icestorm") - "/share/icebox")))) + (list + #:configure-flags + #~(list "-DARCH=ice40" + "-DBUILD_TESTS=ON" + (string-append "-DCURRENT_GIT_VERSION=" + #$(string-take commit 8)) + (string-append "-DICEBOX_ROOT=" + #$(this-package-input "icestorm") + "/share/icebox")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/3rdparty/sanitizers-cmake/cmake") + (string-append + #$(this-package-native-input "sanitizers-cmake") + "/share/sanitizers-cmake/cmake"))) + (substitute* "gui/CMakeLists.txt" + ;; Compile with system imgui and qtimgui headers. + (("^(target_include_directories.*)../3rdparty/imgui(.*)$" + _ prefix suffix) + (string-append prefix + (search-input-directory inputs + "include/imgui") + suffix)) + (("^(target_include_directories.*)../3rdparty/qtimgui/(.*)$" + _ prefix suffix) + (string-append prefix + (search-input-directory inputs + "include/qtimgui") + suffix)))))))) (synopsis "Place-and-Route tool for FPGAs") (description "Nextpnr aims to be a vendor neutral, timing driven, FOSS FPGA place and route tool.") -- 2.38.1