diff mbox series

[bug#72882,core-updates] gnu: grub; ipxe-qemu: Fix build on 32-bit x86.

Message ID 20240829233251.2041-1-nandre@riseup.net
State New
Headers
Series [bug#72882,core-updates] gnu: grub; ipxe-qemu: Fix build on 32-bit x86. |

Commit Message

André Batista Aug. 29, 2024, 11:32 p.m. UTC 
* gnu/packages/bootloaders.scm (grub) [native-inputs] <binutils-i386>:
binutils' #configure-flags is a gexp instead of a simple list, so use
gexp handling procedures when setting flags.
* gnu/packages/bootloaders.scm (ipxe-qemu) [native-inputs]
  <binutils-64-bit-bfd>: Likewise.

Change-Id: If93b0a972570d75c7e26647b154be8afc76cf6e0

---
 gnu/packages/bootloaders.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


base-commit: 87cc46aefce0072dc83e667d85a59a34eecfd89f

Comments

Ludovic Courtès Aug. 30, 2024, 8:44 a.m. UTC | #1 
Hi André,

André Batista <nandre@riseup.net> skribis:

> * gnu/packages/bootloaders.scm (grub) [native-inputs] <binutils-i386>:
> binutils' #configure-flags is a gexp instead of a simple list, so use
> gexp handling procedures when setting flags.
> * gnu/packages/bootloaders.scm (ipxe-qemu) [native-inputs]
>   <binutils-64-bit-bfd>: Likewise.
>
> Change-Id: If93b0a972570d75c7e26647b154be8afc76cf6e0

Applied, thanks!

Ludo’.
diff mbox series

Patch

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 7baf882bde..353b2c2a16 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -284,7 +284,7 @@  (define-public grub
                                    (arguments
                                     (substitute-keyword-arguments (package-arguments binutils)
                                       ((#:configure-flags flags ''())
-                                       `(cons "--enable-64-bit-bfd" ,flags)))))))
+                                       #~(cons* "--enable-64-bit-bfd" #$flags)))))))
                    (list (make-ld-wrapper "ld-wrapper-i386"
                                           #:binutils binutils)
                          binutils))
@@ -2078,7 +2078,7 @@  (define-public ipxe-qemu
                      (arguments
                        (substitute-keyword-arguments (package-arguments binutils)
                         ((#:configure-flags flags ''())
-                         `(cons "--enable-64-bit-bfd" ,flags)))))))
+                         #~(cons* "--enable-64-bit-bfd" #$flags)))))))
              (modify-inputs (package-native-inputs ipxe)
                (prepend edk2-tools
                         (make-ld-wrapper "ld-wrapper-64-bit-bfd"