[packages/grub2] One more revert

arekm arekm at pld-linux.org
Tue Mar 3 13:01:56 CET 2026


commit 6e9c586226c9cdc8e7fc9a401e1db0414ef61b88
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 3 13:01:45 2026 +0100

    One more revert

 image-base.patch | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/image-base.patch b/image-base.patch
index c60e919..f9510cf 100644
--- a/image-base.patch
+++ b/image-base.patch
@@ -15,11 +15,9 @@ index 70c1912f8..fa7840f09 100644
  void cmain (void);
  void
  cmain (void)
-diff --git b/configure.ac a/configure.ac
-index a282bf7bf..17937baf4 100644
---- b/configure.ac
-+++ a/configure.ac
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
+--- grub-2.14/configure.ac.org	2026-03-03 12:54:23.256474391 +0100
++++ grub-2.14/configure.ac	2026-03-03 12:54:38.716838858 +0100
+@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_forma
    TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
    TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
    TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
@@ -35,9 +33,15 @@ index a282bf7bf..17937baf4 100644
    TARGET_IMG_CFLAGS=
  fi
  
-@@ -1800,18 +1800,6 @@ grub_PROG_TARGET_CC
- m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
- 
+@@ -1792,24 +1794,7 @@ LIBS=""
+ # Defined in acinclude.m4.
+ grub_ASM_USCORE
+ grub_PROG_TARGET_CC
+-
+-# The error message produced by autoconf if autoconf-archive is not installed is
+-# quite misleading and not very helpful. So, try point people in the right direction.
+-m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
+-
  if test "x$TARGET_APPLE_LINKER" != x1 ; then
 -AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
 -    [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
@@ -54,4 +58,3 @@ index a282bf7bf..17937baf4 100644
  grub_PROG_OBJCOPY_ABSOLUTE
  fi
  grub_PROG_LD_BUILD_ID_NONE
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/6e9c586226c9cdc8e7fc9a401e1db0414ef61b88



More information about the pld-cvs-commit mailing list