commit da64f27b9bf3fa53a13fae593e3e73390c692f7a
Author: Jan Palus <[email protected]>
Date: Thu Jun 6 20:05:59 2024 +0200
add x32 patch
grub2.spec | 2 ++
x32.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/grub2.spec b/grub2.spec
index 3309779..144444c 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -165,6 +165,7 @@ Patch10: ignore-kernel-symlinks.patch
Patch11: choose-preferred-initrd.patch
Patch12: %{name}-cfg.patch
Patch14: blscfg.patch
+Patch15: x32.patch
URL: http://www.gnu.org/software/grub/
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11.1-1
@@ -533,6 +534,7 @@ Motyw starfield dla GRUB-a.
%patch11 -p1
%patch12 -p0
%patch14 -p1
+%patch15 -p1
# we don't have C.utf-8 and need an UTF-8 locale for build
sed -i -e 's/LC_ALL=C.UTF-8/LC_ALL=en_US.utf-8/g' po/Makefile* po/Rules*
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..8f526ec
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- grub-2.12/include/grub/efi/api.h.orig 2023-11-22 18:52:44.000000000
+0100
++++ grub-2.12/include/grub/efi/api.h 2024-06-06 19:27:51.082911968 +0200
+@@ -587,7 +587,7 @@
+ */
+ #if defined(__i386__)
+ #define __grub_efi_api __attribute__((regparm(0)))
+-#elif defined(__x86_64__)
++#elif defined(__x86_64__) && !defined(__ILP32__)
+ #define __grub_efi_api __attribute__((ms_abi))
+ #else
+ #define __grub_efi_api
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/da64f27b9bf3fa53a13fae593e3e73390c692f7a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
