[PATCH] Fix grub-emu on Cygwin

[PATCH] Fix grub-emu on Cygwin

[Christian Franke]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

This fixes build of grub-emu on Cygwin, works also for 
--enable-grub-emu-modules.

-- 
Regards,
Christian Franke


[-- Attachment #2: grub2-cygwin-emu-fix.patch --]
[-- Type: text/x-patch, Size: 1602 bytes --]

=== modified file 'ChangeLog'
--- ChangeLog	2010-04-19 10:34:56 +0000
+++ ChangeLog	2010-04-19 15:31:52 +0000
@@ -1,3 +1,10 @@
+2010-04-19  Christian Franke  <franke@computer.org>
+
+	* configure.ac: Do not CHECK_BSS_START_SYMBOL
+	and CHECK_END_SYMBOL if grub-emu is built.
+	Unset TARGET_OBJ2ELF if grub-emu is built
+	without module support.
+
 2010-04-19  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix emu build with grub-emu-pci and grub-emu-modules.

=== modified file 'configure.ac'
--- configure.ac	2010-04-18 17:57:50 +0000
+++ configure.ac	2010-04-19 15:40:52 +0000
@@ -513,11 +513,11 @@
 fi
 grub_PROG_LD_BUILD_ID_NONE
 if test "x$target_cpu" = xi386; then
-  if test ! -z "$TARGET_IMG_LDSCRIPT"; then
-    # Check symbols provided by linker script.
-    CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
-  fi
-  if test "x$TARGET_APPLE_CC" != x1 ; then
+  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
+    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+      # Check symbols provided by linker script.
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
+    fi
     grub_CHECK_BSS_START_SYMBOL
     grub_CHECK_END_SYMBOL
   fi
@@ -637,6 +637,12 @@
 fi
 AC_SUBST(TARGET_NO_MODULES)
 
+if test "$TARGET_NO_MODULES" = yes ; then
+  # Do not convert modules, otherwise linkage may fail (Cygwin only).
+  # FIXME: Should be checked above before TARGET_OBJ2ELF is set first.
+  TARGET_OBJ2ELF=
+fi
+
 if test x"$enable_grub_emu_usb" = xno ; then
   grub_emu_usb_excuse="explicitly disabled"
 fi

Re: [PATCH] Fix grub-emu on Cygwin

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

Applied
Christian Franke wrote:
> This fixes build of grub-emu on Cygwin, works also for
> --enable-grub-emu-modules.
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> http://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 293 bytes --]