me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Jean-Pierre De Jesus DIAZ 2024-02-29 16:20:48 +01:00 committed by Ludovic Courtès
parent f97f5312cc
commit 4c88ffdb65
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/cross-base.scm
View File

@ -97,7 +97,18 @@
(warning (G_ "'cross-binutils' must be used with keyword arguments~%")) (warning (G_ "'cross-binutils' must be used with keyword arguments~%"))
(cross-binutils* target #:binutils binutils)) (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." "Return a cross-Binutils for TARGET using BINUTILS."
(let ((binutils (package (let ((binutils (package
(inherit binutils) (inherit binutils)

10
gnu/packages/firmware.scm
View File

@ -139,14 +139,8 @@
;; The firmware is cross-compiled using a "bare bones" compiler (no libc.) ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
;; Use our own tool chain for that. ;; Use our own tool chain for that.
(native-inputs `(("cross-gcc" ,(cross-gcc (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-ath9k-elf"))
"xtensa-ath9k-elf" ("cross-binutils" ,(cross-binutils "xtensa-ath9k-elf"))
#:xbinutils (cross-binutils
"xtensa-ath9k-elf"
#:binutils binutils-2.33)))
("cross-binutils" ,(cross-binutils
"xtensa-ath9k-elf"
#:binutils binutils-2.33))
("cmake" ,cmake-minimal) ("cmake" ,cmake-minimal)
("perl" ,perl))) ("perl" ,perl)))
(home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc") (home-page "https://wireless.wiki.kernel.org/en/users/Drivers/ath9k_htc")