From 8107f4cb851482027bfaea0ea90b37918bcf2def Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Fri, 29 Jun 2012 11:14:25 -0600
Subject: [PATCH] don't double patch!

---
 debian/patches/cross-build.diff | 53 ---------------------------------
 1 file changed, 53 deletions(-)

diff --git a/debian/patches/cross-build.diff b/debian/patches/cross-build.diff
index fc607ce..396ea85 100644
--- a/debian/patches/cross-build.diff
+++ b/debian/patches/cross-build.diff
@@ -1,56 +1,3 @@
-diff --git a/Make.defaults b/Make.defaults
-index e541ea8..7812807 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -62,13 +62,15 @@ EFICRT0	   = /usr/lib
- CDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
- TOPDIR  =
- 
--ARCH	   = $(shell uname -m | sed s,i[3456789]86,ia32,)
-+HOSTARCH   = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
-+ARCH	   := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
- INCDIR	   = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(TOPDIR)/efi110
- CPPFLAGS   = -DCONFIG_$(ARCH) 
- 
- OPTIMFLAGS = -O2 
- DEBUGFLAGS = -Wall
--CFLAGS     = $(OPTIMFLAGS) -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar $(DEBUGFLAGS)
-+CFLAGS     = $(ARCH3264) $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
-+ASFLAGS    = $(ARCH3264)
- LDFLAGS	   = -nostdlib -znocombreloc
- INSTALL	   = install
- 
-@@ -108,10 +110,30 @@ OBJCOPY	        = $(prefix)objcopy
- 
- # Use Modified binutils that supports x86_64 using UEFI ABI
- ifeq ($(ARCH), x86_64)
-+  ifeq ($(HOSTARCH), ia32)
-+	ARCH3264 = -m64
-+	LD3264 = -melf_x86_64
-+
-+	GNUEFILIB := $(GNUEFILIB)64
-+	EFILIB    := $(EFILIB)64
-+	EFICRT0   := $(EFICRT0)64
-+  endif
-+
-         CFLAGS   += -DEFI_FUNCTION_WRAPPER
- 	OBJCOPY	  = /usr/bin/objcopy
- endif
- 
-+ifeq ($(ARCH), ia32)
-+  ifeq ($(HOSTARCH), x86_64)
-+	ARCH3264 = -m32
-+	LD3264 = -melf_i386
-+
-+	GNUEFILIB := /usr/lib32
-+	EFILIB    := /usr/lib32
-+	EFICRT0   := /usr/lib32
-+  endif
-+endif
-+
- ifeq ($(ARCH),ia64)
-  GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
- 
 diff --git a/Makefile b/Makefile
 index f0efebd..9d82cbf 100644
 --- a/Makefile
-- 
2.30.2