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>
This commit is contained in:
		
							parent
							
								
									f97f5312cc
								
							
						
					
					
						commit
						4c88ffdb65
					
				
					 2 changed files with 14 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -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)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue