From 68cc0968fb1d3fa5b7a11d0a1d5a97c3cc479a41 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 10 Jun 2013 18:03:03 +0200 Subject: [PATCH] Dropping gnu-efi.patch, included upstream. --- debian/patches/0009-gnu-efi.patch | 42 --------------------------------------- debian/patches/series | 1 - 2 files changed, 43 deletions(-) delete mode 100644 debian/patches/0009-gnu-efi.patch diff --git a/debian/patches/0009-gnu-efi.patch b/debian/patches/0009-gnu-efi.patch deleted file mode 100644 index dd9157a9..00000000 --- a/debian/patches/0009-gnu-efi.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: Matt Fleming -Description: Fix build with gnu-efi >= 3.0s - -diff -Naurp syslinux.orig/efi/efi.h syslinux/efi/efi.h ---- syslinux.orig/efi/efi.h -+++ syslinux/efi/efi.h -@@ -4,6 +4,21 @@ - #include - #include /* needed for off_t */ - //#include /* avoid redefinition of __STDC_VERSION__ */ -+ -+/* -+ * gnu-efi >= 3.0s enables GNU_EFI_USE_MS_ABI by default, which means -+ * that we must also enable it if supported by the compiler. Note that -+ * failing to enable GNU_EFI_USE_MS_ABI if gnu-efi was compiled with -+ * it on will result in undefined references to uefi_call_wrapper(). -+ * -+ * The reason we don't attempt to check the version of gnu-efi we're -+ * building against is because there's no harm in turning it on for -+ * older versions - it will just be ignored. -+ */ -+ /* #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && _GNUC_MINOR__ >= 7)) */ -+ #define GNU_EFI_USE_MS_ABI 1 -+ /* #endif */ -+ - #include - #include - #include -diff -Naurp syslinux.orig/efi/vesa.c syslinux/efi/vesa.c ---- syslinux.orig/efi/vesa.c -+++ syslinux/efi/vesa.c -@@ -33,9 +33,7 @@ - #include - #include - #include --#include --#include --#include -+#include "efi.h" - /* We use cp865_8x16.psf as the standard font for EFI implementation - * the header file below contains raw data parsed from cp865_8x16.psf - */ diff --git a/debian/patches/series b/debian/patches/series index 2a455cf2..2ec3dc5b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 0006-digest-sha.patch 0007-gfxboot-menu-label.patch 0008-extlinux-manpage.patch -0009-gnu-efi.patch -- 2.11.4.GIT