Grub Development Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Franke <Christian.Franke@t-online.de>
To: grub-devel@gnu.org
Subject: [PATCH] Fix grub-emu on Cygwin
Date: Mon, 19 Apr 2010 18:48:34 +0200	[thread overview]
Message-ID: <4BCC8962.4020000@t-online.de> (raw)

[-- 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


             reply	other threads:[~2010-04-19 16:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-19 16:48 Christian Franke [this message]
2010-04-24 20:42 ` [PATCH] Fix grub-emu on Cygwin Vladimir 'φ-coder/phcoder' Serbinenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BCC8962.4020000@t-online.de \
    --to=christian.franke@t-online.de \
    --cc=grub-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox