[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k
From: |
Jean-Pierre De Jesus DIAZ |
Subject: |
[bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k. |
Date: |
Thu, 29 Feb 2024 16:20:48 +0100 |
* 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
---
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 93383089e5..d275ae894d 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -97,7 +97,18 @@ (define* (cross-binutils/deprecated target #:optional
(binutils binutils))
(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 6993925387..ad687d1de6 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -139,14 +139,8 @@ (define-public ath9k-htc-firmware
;; 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")
--
2.41.0
- [bug#69476] [PATCH 0/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 1/8] doc: Add documentation for x86_64-linux-gnux32., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k.,
Jean-Pierre De Jesus DIAZ <=
- [bug#69476] [PATCH 7/8] guix: cmake-build-system: Handle unknown systems., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 3/8] gnu: ath9k-htc-firmware: Remove binary blobs., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 8/8] gnu: ath9k-htc-firmware: Split package., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 2/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29