From 881038ccdc2b1c42138c66f2a70fdcfc465eb5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Batista?= <nandre@riseup.net>
Date: Wed, 17 Sep 2025 16:58:59 -0300
Subject: [PATCH] gnu: ipxe-qemu: Fix build on x86-32.

* gnu/packages/bootloaders.scm (ipxe) [arguments] <#:phases>: Conditionally add
a 'fix-x86-align phase to fix (U)INT64 assertion failure on these arches.

Change-Id: I9481b41c563984e7cd120b3039c08fe086263f72
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---
 gnu/packages/bootloaders.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 0632f5de653cac9d43b77ca9fd3f014b3ac69f48..ae2bf2218f00e4dc90f866f3d78b0effe13ac42e 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
 ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2025 Esther Flashner <esther@flashner.co.il>
+;;; Copyright © 2025 André Batista <nandre@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2031,6 +2032,13 @@ order to add a suitable bootloader menu entry.")
                              "/share/syslinux \\\n"
                              all))))))
                  #~())
+            #$@(if (target-x86-32?)
+                 ;; Otherwise (u)int64 assertion failure on this arch.
+                 ;; See <https://github.com/ipxe/ipxe/issues/1506>
+                 #~((add-after 'enter-source-directory 'fix-x86-align
+                      (lambda _
+                        (setenv "HOST_EFI_CFLAGS" "-malign-double"))))
+                 #~())
             (delete 'configure)         ; no configure script
             (replace 'install
               (lambda _