From patchwork Thu Sep 28 20:14:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 54381 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 BF0DF27BBEA; Thu, 28 Sep 2023 21:16:22 +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=ham 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 C393227BBE2 for ; Thu, 28 Sep 2023 21:16:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlxQd-00081i-Ol; Thu, 28 Sep 2023 16:16:07 -0400 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 1qlxQL-0007zo-U6 for guix-patches@gnu.org; Thu, 28 Sep 2023 16:15:50 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qlxQK-0000n1-ML for guix-patches@gnu.org; Thu, 28 Sep 2023 16:15:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlxQY-0006eX-TG for guix-patches@gnu.org; Thu, 28 Sep 2023 16:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66259] [PATCH 2/4] gnu: sdcc: Adjust format. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 20:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66259 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66259@debbugs.gnu.org Received: via spool by 66259-submit@debbugs.gnu.org id=B66259.169593215124231 (code B ref 66259); Thu, 28 Sep 2023 20:16:02 +0000 Received: (at 66259) by debbugs.gnu.org; 28 Sep 2023 20:15:51 +0000 Received: from localhost ([127.0.0.1]:54615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQM-0006HF-0H for submit@debbugs.gnu.org; Thu, 28 Sep 2023 16:15:50 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:55832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQJ-00060C-K8 for 66259@debbugs.gnu.org; Thu, 28 Sep 2023 16:15:48 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id EB89964083 for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MWspu7vCTdQt for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:57 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (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 5166E6406C for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:57 +0000 (UTC) From: Simon South Date: Thu, 28 Sep 2023 16:14:46 -0400 Message-ID: <0e5a8d21461c48d10c40e920c7d923f7eba81341.1695929761.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (sdcc): Move arguments above inputs; punctuate comments consistently. [arguments]<#:configure-flags>: Move comment regarding GPUTILS to associated flags; add comment for "--disable-ucsim". [home-page]: Add trailing slash to URL. --- gnu/packages/embedded.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 8de3c9c630..630f2b37e0 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1649,24 +1649,26 @@ (define-public sdcc (modules '((guix build utils))) (snippet #~(begin - ;; Remove non-free source files + ;; Remove non-free source files. (delete-file-recursively "device/non-free") - ;; Remove bundled μCsim source + ;; Remove bundled μCsim source. (delete-file-recursively "sim"))) (patches (search-patches "sdcc-disable-non-free-code.patch")))) (build-system gnu-build-system) - (inputs - (list readline)) - (native-inputs - (list bison boost flex python-2 texinfo zlib)) (arguments (list - ;; 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 - #~(list "--disable-pic14-port" "--disable-pic16-port" "--disable-ucsim") + #~(list + ;; 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. + "--disable-pic14-port" + "--disable-pic16-port" + + ;; Do not build or install the bundled copy of μCsim, for which Guix + ;; has its own package. + "--disable-ucsim") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-makefiles @@ -1679,7 +1681,11 @@ (define-public sdcc (string-append line "\n" "TARGETS += sdcc-misc\n" "PKGS += $(SDCC_MISC)")))))))) - (home-page "https://sdcc.sourceforge.net") + (inputs + (list readline)) + (native-inputs + (list bison boost flex python-2 texinfo zlib)) + (home-page "https://sdcc.sourceforge.net/") (synopsis "C compiler suite for 8-bit microcontrollers") (description "SDCC is a retargetable, optimizing Standard C compiler suite that targets 8-bit microcontrollers in the Intel MCS-51 (8051); MOS Technology