From patchwork Thu Sep 28 20:14:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 54379 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 6A55C27BBEA; Thu, 28 Sep 2023 21:16:08 +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 B7F4C27BBE2 for ; Thu, 28 Sep 2023 21:16:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlxQQ-00080O-LG; Thu, 28 Sep 2023 16:15:55 -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-0007zn-Tl 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 1qlxQJ-0000mB-Re 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-0006dQ-50 for guix-patches@gnu.org; Thu, 28 Sep 2023 16:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66259] [PATCH 1/4] gnu: sdcc: Update package style. 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.169593215024139 (code B ref 66259); Thu, 28 Sep 2023 20:16:02 +0000 Received: (at 66259) by debbugs.gnu.org; 28 Sep 2023 20:15:50 +0000 Received: from localhost ([127.0.0.1]:54613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQL-0006GL-6g for submit@debbugs.gnu.org; Thu, 28 Sep 2023 16:15:49 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:55826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlxQI-0005xd-LI for 66259@debbugs.gnu.org; Thu, 28 Sep 2023 16:15:47 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id C7A4A64065 for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:56 +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 b7quR3H3v9-y for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:56 +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 6F3A16406C for <66259@debbugs.gnu.org>; Thu, 28 Sep 2023 20:14:56 +0000 (UTC) From: Simon South Date: Thu, 28 Sep 2023 16:14:45 -0400 Message-ID: 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)[source]: Use gexp; drop trailing #t. [arguments]: Use gexps. <#:phases>: Drop trailing #t from phase. --- gnu/packages/embedded.scm | 49 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 040290f94e..8de3c9c630 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1648,12 +1648,11 @@ (define-public sdcc "0ly0m3q9vzjb9kcfjh79s77wpl4w7xhybzy4h9x0bmmw4cfsx6xl")) (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)) + #~(begin + ;; Remove non-free source files + (delete-file-recursively "device/non-free") + ;; Remove bundled μCsim source + (delete-file-recursively "sim"))) (patches (search-patches "sdcc-disable-non-free-code.patch")))) (build-system gnu-build-system) (inputs @@ -1661,25 +1660,25 @@ (define-public sdcc (native-inputs (list bison boost flex python-2 texinfo zlib)) (arguments - `(;; 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 - (modify-phases %standard-phases - (add-after 'unpack 'patch-makefiles - (lambda _ - (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh"))) - ;; --disable-ucsim disables sdcc-misc, patch it back in. - (substitute* "Makefile.in" - (("debugger/mcs51" line) - (string-append line "\n" - "TARGETS += sdcc-misc\n" - "PKGS += $(SDCC_MISC)"))) - #t))))) + (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") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefiles + (lambda _ + (substitute* (find-files "." "(\\.mk$|\\.in$)") + (("/bin/sh") (which "sh"))) + ;; --disable-ucsim disables sdcc-misc, patch it back in. + (substitute* "Makefile.in" + (("debugger/mcs51" line) + (string-append line "\n" + "TARGETS += sdcc-misc\n" + "PKGS += $(SDCC_MISC)")))))))) (home-page "https://sdcc.sourceforge.net") (synopsis "C compiler suite for 8-bit microcontrollers") (description "SDCC is a retargetable, optimizing Standard C compiler suite