Fix efiemu configure check.

diff --git a/debian/changelog b/debian/changelog
index ee4d5459e9174a4cdaca7d7f5aba91b1208dcc65..114cc4ffbe490a77fedfa5d2bbc93a3c40530f21 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ grub2 (1.99-18) UNRELEASED; urgency=low
     OS loop devices (thanks, bcbc; LP: #888281).
   * Backport from upstream:
     - Add support for LZO compression in btrfs (LP: #727535).
+    - Fix efiemu configure check.
 
   [ Ilya Yanok ]
   * Backport from upstream:

diff --git a/debian/patches/efiemu_fix.patch b/debian/patches/efiemu_fix.patch
new file mode 100644 (file)
index 0000000..0c4ef52
--- /dev/null
+++ b/debian/patches/efiemu_fix.patch
@@ -0,0 +1,131 @@
+Description: Fix efiemu
+ Without this, lzo.patch causes efiemu not to be built.
+Author: Vladimir Serbinenko <phcoder@gmail.com>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3740
+Forwarded: not-needed
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3740
+Last-Update: 2012-03-19
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -479,6 +479,40 @@
+ esac
+ AC_MSG_RESULT([$TARGET_OBJ2ELF])
+ 
++
++AC_ARG_ENABLE([efiemu],
++            [AS_HELP_STRING([--enable-efiemu],
++                             [build and install the efiemu runtimes (default=guessed)])])
++if test x"$enable_efiemu" = xno ; then
++  efiemu_excuse="explicitly disabled"
++fi
++if test x"$target_cpu" != xi386 ; then
++  efiemu_excuse="only available on i386"
++fi
++if test x"$platform" = xefi ; then
++  efiemu_excuse="not available on efi"
++fi
++if test x"$efiemu_excuse" = x ; then
++  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
++    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++                    [grub_cv_cc_efiemu=yes],
++                    [grub_cv_cc_efiemu=no])
++  ])
++  if test x$grub_cv_cc_efiemu = xno; then
++     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
++  fi
++fi
++if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
++  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
++fi
++if test x"$efiemu_excuse" = x ; then
++enable_efiemu=yes
++else
++enable_efiemu=no
++fi
++AC_SUBST([enable_efiemu])
++
+ if test "x$target_m32" = x1; then
+   # Force 32-bit mode.
+   TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+@@ -638,39 +672,6 @@
+   grub_I386_ASM_ADDR32
+ fi
+ 
+-AC_ARG_ENABLE([efiemu],
+-            [AS_HELP_STRING([--enable-efiemu],
+-                             [build and install the efiemu runtimes (default=guessed)])])
+-if test x"$enable_efiemu" = xno ; then
+-  efiemu_excuse="explicitly disabled"
+-fi
+-if test x"$target_cpu" != xi386 ; then
+-  efiemu_excuse="only available on i386"
+-fi
+-if test x"$platform" = xefi ; then
+-  efiemu_excuse="not available on efi"
+-fi
+-if test x"$efiemu_excuse" = x ; then
+-  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
+-    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
+-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+-                    [grub_cv_cc_efiemu=yes],
+-                    [grub_cv_cc_efiemu=no])
+-  ])
+-  if test x$grub_cv_cc_efiemu = xno; then
+-     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
+-  fi
+-fi
+-if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
+-  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
+-fi
+-if test x"$efiemu_excuse" = x ; then
+-enable_efiemu=yes
+-else
+-enable_efiemu=no
+-fi
+-AC_SUBST([enable_efiemu])
+-
+ if test "$platform" != emu; then
+ AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+   SAVED_CPPFLAGS="$CPPFLAGS"
+Index: b/grub-core/efiemu/runtime/efiemu.c
+===================================================================
+--- a/grub-core/efiemu/runtime/efiemu.c
++++ b/grub-core/efiemu/runtime/efiemu.c
+@@ -21,6 +21,12 @@
+    As it emulates only runtime serviceit isn't able
+    to chainload EFI bootloader on non-EFI system (TODO) */
+ 
++#ifdef __i386__
++#include <grub/i386/types.h>
++#else
++#include <grub/x86_64/types.h>
++#endif
++
+ #include <grub/symbol.h>
+ #include <grub/types.h>
+ #include <grub/efi/api.h>
+@@ -369,16 +375,16 @@
+       switch (cur_relloc->size)
+       {
+       case 8:
+-        *((grub_uint64_t *) UINT_TO_PTR (cur_relloc->addr)) += corr;
++        *((grub_uint64_t *) (grub_addr_t) cur_relloc->addr) += corr;
+         break;
+       case 4:
+-        *((grub_uint32_t *) UINT_TO_PTR (cur_relloc->addr)) += corr;
++        *((grub_uint32_t *) (grub_addr_t) cur_relloc->addr) += corr;
+         break;
+       case 2:
+-        *((grub_uint16_t *) UINT_TO_PTR (cur_relloc->addr)) += corr;
++        *((grub_uint16_t *) (grub_addr_t) cur_relloc->addr) += corr;
+         break;
+       case 1:
+-        *((grub_uint8_t *) UINT_TO_PTR (cur_relloc->addr)) += corr;
++        *((grub_uint8_t *) (grub_addr_t) cur_relloc->addr) += corr;
+         break;
+       }
+     }

diff --git a/debian/patches/series b/debian/patches/series
index 7cd0f55f6626214936df3e581e5013a786a0408b..4d145be2ef5f073193a7423a070aad47b72a3925 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@ mkconfig_gnumach.patch
 gcc_4_6_space.patch
 lzo.patch
 fat_uuid.patch
+efiemu_fix.patch