Subject: [bug#66259] [PATCH 2/4] gnu: sdcc: Adjust format.

From: Simon South <[email-masked]>
Date: Thu, 28 Sep 2023 16:14:46 -0400

* 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
-- 
2.41.0