[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build.
From: |
Maxim Cournoyer |
Subject: |
[bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build. |
Date: |
Wed, 11 Jan 2023 15:44:24 -0500 |
* 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.
---
(no changes since v3)
Changes in v3:
- Rename %current-target-system to %current-system in comment
gnu/packages/bootloaders.scm | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 10750e0448..4a27a36d78 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -867,9 +867,11 @@ (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 ()
+ ;; Note: %current-system is a *triplet*, unlike its
+ ;; name would suggest.
+ (string=? (%current-system)
+ (gnu-triplet->nix-system triplet)))))
(package
(inherit u-boot)
(name (string-append "u-boot-"
@@ -880,16 +882,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)
@@ -906,7 +903,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))
--
2.38.1
- [bug#60224] [PATCH v4 01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 02/12] gnu: make-u-boot-package: Install .imx files., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build.,
Maxim Cournoyer <=
- [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 04/12] gnu: make-u-boot-package: Allow disabling cross-compilation., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 05/12] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 11/12] gnu: make-arm-trusted-firmware: Simplify build., Maxim Cournoyer, 2023/01/11