10/13: gnu: cross-binutils: Use binutils-2.33 for ath9k.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 4c88ffdb6592a095f9ad47a19399acd9914a8022
Author: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>
AuthorDate: Thu Feb 29 16:20:48 2024 +0100

    gnu: cross-binutils: Use binutils-2.33 for ath9k.
    
    * gnu/packages/cross-base.scm (cross-binutils-package): New procedure.
    * gnu/packages/cross-base.scm (cross-binutils): Select binutils default
    value with cross-binutils-package.
    * gnu/packages/firmware.scm (ath9k-htc-firmware) <native-inputs>: Do not
    explicitly set the #:xbinutils keyword argument.
    
    Change-Id: I0eb25eb2b494241c205286837bfa79a61de8e0b7
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/cross-base.scm | 13 ++++++++++++-
 gnu/packages/firmware.scm   | 10 ++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index ab8c757acc..2cc5f52e47 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -97,7 +97,18 @@
   (warning (G_ "'cross-binutils' must be used with keyword arguments~%"))
   (cross-binutils* target #:binutils binutils))
 
-(define* (cross-binutils* target #:key (binutils binutils))
+(define (cross-binutils-package target)
+  "Returns the default package to use for a cross-Binutils for TARGET."
+  (cond
+    ;; The xtensa-ath9k-elf target is used solely to build the firmware for
+    ;; ath9k devices, the patches to binutils have not been updated and
+    ;; only apply to binutils@2.33.
+    ((string=? target "xtensa-ath9k-elf") binutils-2.33)
+    (else binutils)))
+
+(define* (cross-binutils* target
+                          #:key
+                          (binutils (cross-binutils-package target)))
   "Return a cross-Binutils for TARGET using BINUTILS."
   (let ((binutils (package
                     (inherit binutils)
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 1526a125f3..4664744ac6 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -139,14 +139,8 @@
 
     ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
     ;; Use our own tool chain for that.
-    (native-inputs `(("cross-gcc" ,(cross-gcc
-                                    "xtensa-ath9k-elf"
-                                    #:xbinutils (cross-binutils
-                                                 "xtensa-ath9k-elf"
-                                                 #:binutils binutils-2.33)))
-                     ("cross-binutils" ,(cross-binutils
-                                         "xtensa-ath9k-elf"
-                                         #:binutils binutils-2.33))
+    (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-ath9k-elf"))
+                     ("cross-binutils" ,(cross-binutils "xtensa-ath9k-elf"))
                      ("cmake" ,cmake-minimal)
                      ("perl" ,perl)))
     (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc";)