all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 60224@debbugs.gnu.org
Cc: rekado@elephly.net, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#60224] [PATCH v3 03/11] gnu: make-uboot-package: Simplify build.
Date: Sun,  1 Jan 2023 19:46:28 -0500	[thread overview]
Message-ID: <20230102004637.3920-3-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com>

* 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.

---

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 75033c4def..c3c15d557a 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -862,9 +862,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-"
@@ -875,16 +877,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)
@@ -901,7 +898,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





  parent reply	other threads:[~2023-01-02  0:48 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-20 16:50 [bug#60224] [PATCH 0/9] Improvements to our u-boot tooling Maxim Cournoyer
2022-12-20 18:34 ` [bug#60224] [PATCH 1/9] gnu: make-u-boot-package: Add a u-boot argument and use gexps Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 2/9] gnu: make-u-boot-package: Install .imx files Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 3/9] gnu: make-uboot-package: Simplify build Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 4/9] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 5/9] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 6/9] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 7/9] gnu: u-boot-rock64-rk3328: Fix build Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs Maxim Cournoyer
2022-12-20 18:34   ` [bug#60224] [PATCH 9/9] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package Maxim Cournoyer
2022-12-29 19:18 ` [bug#60224] [PATCH 0/9] Improvements to our u-boot tooling Ricardo Wurmus
2023-01-02  0:27   ` Maxim Cournoyer
2023-01-02  0:46 ` [bug#60224] [PATCH v3 01/11] gnu: make-u-boot-package: Add a u-boot argument and use gexps Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 02/11] gnu: make-u-boot-package: Install .imx files Maxim Cournoyer
2023-01-02  0:46   ` Maxim Cournoyer [this message]
2023-01-02  0:46   ` [bug#60224] [PATCH v3 04/11] gnu: make-u-boot-package: Allow disabling cross-compilation Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 05/11] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 06/11] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 07/11] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name Maxim Cournoyer
2023-01-06 17:17     ` Vagrant Cascadian
2023-01-11 19:55       ` Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 08/11] gnu: u-boot-rock64-rk3328: Fix build Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 09/11] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs Maxim Cournoyer
2023-01-02  0:46   ` [bug#60224] [PATCH v3 10/11] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package Maxim Cournoyer
2023-01-06 17:09     ` Vagrant Cascadian
2023-01-02  0:46   ` [bug#60224] [PATCH v3 11/11] gnu: u-boot-rockpro64-rk3399: Fix build Maxim Cournoyer
2023-01-11 20:44 ` [bug#60224] [PATCH v4 01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 02/12] gnu: make-u-boot-package: Install .imx files Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 04/12] gnu: make-u-boot-package: Allow disabling cross-compilation Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 05/12] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name Maxim Cournoyer
2023-01-12 22:12     ` Vagrant Cascadian
2023-01-11 20:44   ` [bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 11/12] gnu: make-arm-trusted-firmware: Simplify build Maxim Cournoyer
2023-01-11 20:44   ` [bug#60224] [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build Maxim Cournoyer
2023-01-16  3:25 ` [bug#60224] [PATCH v5 01/13] gnu: make-u-boot-package: Add a u-boot argument and use gexps Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 02/13] gnu: make-u-boot-package: Install .imx files Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 03/13] gnu: u-boot: Reduce the number of native inputs Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 04/13] gnu: make-uboot-package: Simplify build Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 05/13] gnu: make-u-boot-package: Allow disabling cross-compilation Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 06/13] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 07/13] gnu: u-boot-firefly-rk3399: Use gexps and fix build Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: " Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: " Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 10/13] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 11/13] gnu: u-boot-rockpro64-rk3399: Use gexps and fix build Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 12/13] gnu: make-arm-trusted-firmware: Simplify build Maxim Cournoyer
2023-01-16  3:25   ` [bug#60224] [PATCH v5 13/13] gnu: u-boot-puma-rk3399: Use gexps and fix build Maxim Cournoyer
2023-01-19  2:10   ` bug#60224: [PATCH 0/9] Improvements to our u-boot tooling Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230102004637.3920-3-maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=60224@debbugs.gnu.org \
    --cc=rekado@elephly.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.