ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-uboot-package: Simplify build.

Browse source 
* gnu/packages/bootloaders.scm (make-u-boot-package) <same-arch?>: Rename
procedure to 'native-build?'.
[native-inputs]: Remove field.
[arguments]: Specify the #:target argument, when not natively building.
Adjust for the above renaming.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Maxim Cournoyer 2022-12-08 09:40:48 -05:00
parent 680a768384
commit c6a8b1384d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/bootloaders.scm
View file

@ -863,9 +863,9 @@ (define*-public (make-u-boot-package board triplet
NAME-SUFFIX is appended to the package name, while APPEND-DESCRIPTION is
appended to the package description. U-BOOT can be used when a fork or a
different version of U-Boot must be used."
(let ((same-arch? (lambda ()
(string=? (%current-system)
(gnu-triplet->nix-system triplet)))))
(let ((native-build? (lambda ()
(string=? (%current-system)
(gnu-triplet->nix-system triplet)))))
(package
(inherit u-boot)
(name (string-append "u-boot-"
@ -876,16 +876,11 @@ (define*-public (make-u-boot-package board triplet
(string-append (package-description u-boot)
"\n\n" append-description)
(package-description u-boot)))
(native-inputs
;; Note: leave the native u-boot inputs first, so that a user can
;; override the cross-gcc and cross-binutils packages.
`(,@(package-native-inputs u-boot)
,@(if (not (same-arch?))
`(("cross-gcc" ,(cross-gcc triplet))
("cross-binutils" ,(cross-binutils triplet)))
`())))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments u-boot)
((#:target _ #f)
(and (not (native-build?)) triplet))
((#:modules modules '())
`((ice-9 ftw)
(srfi srfi-1)
@ -902,7 +897,7 @@ (define*-public (make-u-boot-package board triplet
((#:make-flags make-flags '())
#~(list "HOSTCC=gcc"
"KBUILD_VERBOSE=1"
#$@(if (not (same-arch?))
#$@(if (not (native-build?))
(list (string-append "CROSS_COMPILE=" triplet "-"))
'())
#$@make-flags))