From patchwork Mon Dec 14 18:06:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 25773 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 6D47527BC05; Mon, 14 Dec 2020 18:14:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2751827BC04 for ; Mon, 14 Dec 2020 18:14:08 +0000 (GMT) Received: from localhost ([::1]:47324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kosMJ-0003pN-Aj for patchwork@mira.cbaines.net; Mon, 14 Dec 2020 13:14:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kosLG-0003Eb-Q4 for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kosLG-00035a-Ht for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kosLG-0005W6-DZ for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45241] [PATCH 1/5] gnu: sdcc: Move to embedded.scm. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45241@debbugs.gnu.org Received: via spool by 45241-submit@debbugs.gnu.org id=B45241.160796957021141 (code B ref 45241); Mon, 14 Dec 2020 18:13:02 +0000 Received: (at 45241) by debbugs.gnu.org; 14 Dec 2020 18:12:50 +0000 Received: from localhost ([127.0.0.1]:54383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL3-0005Uq-Ll for submit@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:50 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:42896) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL1-0005UZ-9V for 45241@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:47 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id B27FAA110E; Mon, 14 Dec 2020 18:12:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kOcKNDMdAvNw; Mon, 14 Dec 2020 18:12:41 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C4E30A09E4; Mon, 14 Dec 2020 18:12:39 +0000 (UTC) From: Simon South Date: Mon, 14 Dec 2020 13:06:44 -0500 Message-Id: <044415c8fa95ce7d452bf9fe3b31f12a87987d8f.1607965728.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm: Add sdcc from sdcc.scm. * gnu/packages/electronics.scm: Update #:use-module directive. * gnu/packages/sdcc.scm: Delete file. * gnu/local.mk: Remove it. --- gnu/local.mk | 1 - gnu/packages/electronics.scm | 4 +- gnu/packages/embedded.scm | 51 +++++++++++++++++++++++ gnu/packages/sdcc.scm | 80 ------------------------------------ 4 files changed, 53 insertions(+), 83 deletions(-) delete mode 100644 gnu/packages/sdcc.scm diff --git a/gnu/local.mk b/gnu/local.mk index 0b4cf23838..8933dfc168 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -494,7 +494,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/screen.scm \ %D%/packages/scribus.scm \ %D%/packages/scsi.scm \ - %D%/packages/sdcc.scm \ %D%/packages/sdl.scm \ %D%/packages/search.scm \ %D%/packages/security-token.scm \ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 3f9ca33ede..01796bb91c 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) + #:use-module (gnu packages embedded) #:use-module (gnu packages gawk) #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) @@ -39,8 +40,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages qt) - #:use-module (gnu packages sdcc)) + #:use-module (gnu packages qt)) (define-public libserialport (package diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index dd48fe317e..2d822cecf3 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages autotools) #:use-module ((gnu packages base) #:prefix base:) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages cross-base) #:use-module (gnu packages dejagnu) #:use-module (gnu packages flex) @@ -1461,3 +1462,53 @@ microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 68HC08 and 6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8; and Zilog Z80 families, plus many of their variants.") (license license:gpl2+))) + +(define-public sdcc + (package + (name "sdcc") + (version "3.7.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/sdcc/sdcc" + "/" version "/sdcc-src-" version ".tar.bz2")) + (sha256 + (base32 + "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove non-free source files + (delete-file-recursively "device/non-free") + ;; Remove bundled μCsim source + (delete-file-recursively "sim") + #t)) + (patches (search-patches "sdcc-disable-non-free-code.patch")))) + (build-system gnu-build-system) + (native-inputs + `(("bison" ,bison) + ("boost" ,boost) + ("flex" ,flex) + ("python-2" ,python-2) + ("texinfo" ,texinfo))) + (arguments + `(;; gputils is required for PIC ports + #:configure-flags + '("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-makefile + (lambda _ + (substitute* (find-files "." "(\\.mk$|\\.in$)") + (("/bin/sh") (which "sh"))) + #t))))) + (home-page "http://sdcc.sourceforge.net") + (synopsis "Small devices C compiler") + (description "SDCC is a retargetable, optimizing Standard C compiler suite +that targets the Intel MCS51-based microprocessors (8031, 8032, 8051, 8052, ...), +Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) +HC08-based (hc08, s08), Zilog Z80-based MCUs (z80, z180, gbz80, Rabbit +2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. +Work is in progress on supporting the Microchip PIC16 and PIC18 targets. +It can be retargeted for other microprocessors.") + (license license:gpl2+))) diff --git a/gnu/packages/sdcc.scm b/gnu/packages/sdcc.scm deleted file mode 100644 index 0ce71ed955..0000000000 --- a/gnu/packages/sdcc.scm +++ /dev/null @@ -1,80 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 David Craven -;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages sdcc) - #:use-module (gnu packages) - #:use-module (gnu packages bison) - #:use-module (gnu packages boost) - #:use-module (gnu packages flex) - #:use-module (gnu packages python) - #:use-module (gnu packages texinfo) - #:use-module (guix build-system gnu) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module ((guix licenses) #:prefix license:)) - -(define-public sdcc - (package - (name "sdcc") - (version "3.7.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/sdcc/sdcc" - "/" version "/sdcc-src-" version ".tar.bz2")) - (sha256 - (base32 - "13llvx0j3v5qa7qd4fh7nix4j3alpd3ccprxvx163c4q8q4lfkc5")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove non-free source files - (delete-file-recursively "device/non-free") - ;; Remove bundled μCsim source - (delete-file-recursively "sim") - #t)) - (patches (search-patches "sdcc-disable-non-free-code.patch")))) - (build-system gnu-build-system) - (native-inputs - `(("bison" ,bison) - ("boost" ,boost) - ("flex" ,flex) - ("python-2" ,python-2) - ("texinfo" ,texinfo))) - (arguments - `(;; gputils is required for PIC ports - #:configure-flags - '("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-makefile - (lambda _ - (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh"))) - #t))))) - (home-page "http://sdcc.sourceforge.net") - (synopsis "Small devices C compiler") - (description "SDCC is a retargetable, optimizing Standard C compiler suite -that targets the Intel MCS51-based microprocessors (8031, 8032, 8051, 8052, ...), -Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) -HC08-based (hc08, s08), Zilog Z80-based MCUs (z80, z180, gbz80, Rabbit -2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. -Work is in progress on supporting the Microchip PIC16 and PIC18 targets. -It can be retargeted for other microprocessors.") - (license license:gpl2+))) From patchwork Mon Dec 14 18:06:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 25774 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 4104D27BC05; Mon, 14 Dec 2020 18:14:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB5A527BC04 for ; Mon, 14 Dec 2020 18:14:20 +0000 (GMT) Received: from localhost ([::1]:47708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kosMW-0003zk-4C for patchwork@mira.cbaines.net; Mon, 14 Dec 2020 13:14:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kosLH-0003F2-5g for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kosLG-00035e-Uc for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kosLG-0005WD-QI for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45241] [PATCH 2/5] gnu: sdcc: Specify complete set of licenses. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45241@debbugs.gnu.org Received: via spool by 45241-submit@debbugs.gnu.org id=B45241.160796957221151 (code B ref 45241); Mon, 14 Dec 2020 18:13:02 +0000 Received: (at 45241) by debbugs.gnu.org; 14 Dec 2020 18:12:52 +0000 Received: from localhost ([127.0.0.1]:54385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL6-0005V5-BE for submit@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:52 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:43348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL3-0005Ud-J2 for 45241@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:49 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 65BD0A09E5; Mon, 14 Dec 2020 18:12:44 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6NZpKpqvSIma; Mon, 14 Dec 2020 18:12:44 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C49BAA09D2; Mon, 14 Dec 2020 18:12:41 +0000 (UTC) From: Simon South Date: Mon, 14 Dec 2020 13:06:45 -0500 Message-Id: <72a25776059841e35fda8c4717956098799fc0e4.1607965728.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc)[license]: Replace with full list of licenses used by files in the distribution. --- gnu/packages/embedded.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 2d822cecf3..545c512f18 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1511,4 +1511,10 @@ HC08-based (hc08, s08), Zilog Z80-based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors.") - (license license:gpl2+))) + (license (list license:gpl2+ + license:gpl3+ + license:lgpl2.0+ + license:lgpl2.1+ + license:lgpl3+ + license:public-domain + license:zlib)))) From patchwork Mon Dec 14 18:06:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 25772 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 4EDB627BC05; Mon, 14 Dec 2020 18:14:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D20DC27BC04 for ; Mon, 14 Dec 2020 18:14:04 +0000 (GMT) Received: from localhost ([::1]:47110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kosMF-0003ke-Vr for patchwork@mira.cbaines.net; Mon, 14 Dec 2020 13:14:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kosLH-0003Fa-Ja for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kosLH-00035l-BY for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kosLH-0005WL-6q for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45241] [PATCH 3/5] gnu: sdcc: Revise synopsis and description. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 18:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45241@debbugs.gnu.org Received: via spool by 45241-submit@debbugs.gnu.org id=B45241.160796957521166 (code B ref 45241); Mon, 14 Dec 2020 18:13:03 +0000 Received: (at 45241) by debbugs.gnu.org; 14 Dec 2020 18:12:55 +0000 Received: from localhost ([127.0.0.1]:54388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL8-0005VK-KI for submit@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:54 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:43994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL6-0005Ui-HQ for 45241@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:52 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 58DB1A09FC; Mon, 14 Dec 2020 18:12:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3ktXDIDvgupS; Mon, 14 Dec 2020 18:12:47 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id ABE88A09D2; Mon, 14 Dec 2020 18:12:44 +0000 (UTC) From: Simon South Date: Mon, 14 Dec 2020 13:06:46 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc)[synopsis]: State package's use more clearly. [description]: Revise for brevity. --- gnu/packages/embedded.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 545c512f18..47e1f90ac1 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1503,14 +1503,11 @@ and Zilog Z80 families, plus many of their variants.") (("/bin/sh") (which "sh"))) #t))))) (home-page "http://sdcc.sourceforge.net") - (synopsis "Small devices C compiler") + (synopsis "C compiler suite for 8-bit microcontrollers") (description "SDCC is a retargetable, optimizing Standard C compiler suite -that targets the Intel MCS51-based microprocessors (8031, 8032, 8051, 8052, ...), -Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) -HC08-based (hc08, s08), Zilog Z80-based MCUs (z80, z180, gbz80, Rabbit -2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. -Work is in progress on supporting the Microchip PIC16 and PIC18 targets. -It can be retargeted for other microprocessors.") +that targets 8-bit microcontrollers in the Intel MCS-51 (8051), Motorola +68HC08, STMicroelectronics STM8, and Zilog Z80 families, plus many of their +variants.") (license (list license:gpl2+ license:gpl3+ license:lgpl2.0+ From patchwork Mon Dec 14 18:06:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 25775 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 4D35C27BC05; Mon, 14 Dec 2020 18:14:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 062C527BC04 for ; Mon, 14 Dec 2020 18:14:34 +0000 (GMT) Received: from localhost ([::1]:47966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kosMj-000477-5i for patchwork@mira.cbaines.net; Mon, 14 Dec 2020 13:14:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kosLJ-0003GF-1J for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kosLH-00035w-P0 for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kosLH-0005WS-Jn for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45241] [PATCH 4/5] gnu: sdcc: Correct name of phase. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 18:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45241@debbugs.gnu.org Received: via spool by 45241-submit@debbugs.gnu.org id=B45241.160796957821181 (code B ref 45241); Mon, 14 Dec 2020 18:13:03 +0000 Received: (at 45241) by debbugs.gnu.org; 14 Dec 2020 18:12:58 +0000 Received: from localhost ([127.0.0.1]:54391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosLB-0005VZ-Uu for submit@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:58 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosL9-0005V1-Gw for 45241@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:55 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 56198A09E5; Mon, 14 Dec 2020 18:12:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Slm5vKTX8R5f; Mon, 14 Dec 2020 18:12:50 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A3ECEA09D2; Mon, 14 Dec 2020 18:12:47 +0000 (UTC) From: Simon South Date: Mon, 14 Dec 2020 13:06:47 -0500 Message-Id: <1929fc3049af03b5603faa5d87d09029f89a396c.1607965728.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm [arguments]<#:phases>: Rename "patch-makefile" phase to "patch-makefiles". --- gnu/packages/embedded.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 47e1f90ac1..da03d18c6d 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1497,7 +1497,7 @@ and Zilog Z80 families, plus many of their variants.") '("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-makefile + (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") (("/bin/sh") (which "sh"))) From patchwork Mon Dec 14 18:06:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 25771 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 69BD827BC05; Mon, 14 Dec 2020 18:13:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D333727BC04 for ; Mon, 14 Dec 2020 18:13:39 +0000 (GMT) Received: from localhost ([::1]:46278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kosLr-0003MQ-2X for patchwork@mira.cbaines.net; Mon, 14 Dec 2020 13:13:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kosLI-0003G1-BE for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kosLI-000361-48 for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kosLI-0005WZ-08 for guix-patches@gnu.org; Mon, 14 Dec 2020 13:13:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45241] [PATCH 5/5] gnu: sdcc: Expand comment regarding GPUTILS and PIC ports. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 14 Dec 2020 18:13:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45241@debbugs.gnu.org Received: via spool by 45241-submit@debbugs.gnu.org id=B45241.160796958021196 (code B ref 45241); Mon, 14 Dec 2020 18:13:03 +0000 Received: (at 45241) by debbugs.gnu.org; 14 Dec 2020 18:13:00 +0000 Received: from localhost ([127.0.0.1]:54394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosLE-0005Vo-6i for submit@debbugs.gnu.org; Mon, 14 Dec 2020 13:13:00 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:45192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kosLC-0005VI-KF for 45241@debbugs.gnu.org; Mon, 14 Dec 2020 13:12:58 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6F457A09FC; Mon, 14 Dec 2020 18:12:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mPIVyYJ4MOcD; Mon, 14 Dec 2020 18:12:53 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A178FA09E4; Mon, 14 Dec 2020 18:12:50 +0000 (UTC) From: Simon South Date: Mon, 14 Dec 2020 13:06:48 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc)[arguments]: Expand comment to explain why GPUTILS is not yet available and SDCC's PIC ports are disabled. --- gnu/packages/embedded.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index da03d18c6d..a7643deb97 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1492,7 +1492,10 @@ and Zilog Z80 families, plus many of their variants.") ("python-2" ,python-2) ("texinfo" ,texinfo))) (arguments - `(;; gputils is required for PIC ports + `(;; GPUTILS is required for the PIC ports, but the licensing status of + ;; some of the files contained in its distribution is unclear (see + ;; https://issues.guix.gnu.org/44557). For this reason it is not yet + ;; available as a package in Guix. #:configure-flags '("--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim") #:phases