revert Make.defaults to upstream version and move my changes to a patch

diff --git a/Make.defaults b/Make.defaults
index 1eb95ccb8cf28b4e3ca4affe3f162fb98871d440..f5dca13b103f023f405dad5c9a7783117630c6fe 100644 (file)
--- a/Make.defaults
+++ b/Make.defaults
@@ -62,15 +62,13 @@ EFICRT0        = /usr/lib
 CDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 TOPDIR  =
 
-HOSTARCH   = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,)
-ARCH      := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,)
+ARCH      = $(shell uname -m | sed s,i[3456789]86,ia32,)
 INCDIR    = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(TOPDIR)/efi110
 CPPFLAGS   = -DCONFIG_$(ARCH) 
 
 OPTIMFLAGS = -O2 
 DEBUGFLAGS = -Wall
-CFLAGS     = $(ARCH3264) $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
-ASFLAGS    = $(ARCH3264)
+CFLAGS     = $(OPTIMFLAGS) -fno-strict-aliasing -fpic -fshort-wchar $(DEBUGFLAGS)
 LDFLAGS           = -nostdlib -znocombreloc
 INSTALL           = install
 
@@ -110,30 +108,10 @@ 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 := /emul/ia32-linux$(GNUEFILIB)
-       EFILIB    := /emul/ia32-linux$(EFILIB)
-       EFICRT0   := /emul/ia32-linux$(EFICRT0)
-  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/debian/patches/fix-paths.diff b/debian/patches/fix-paths.diff
index ada7f462522fe1c54a0036c7ec312afc8ccef4a3..6cd27126e256aeb2df2ca7ad520cc36c4d9d8812 100644 (file)
--- a/debian/patches/fix-paths.diff
+++ b/debian/patches/fix-paths.diff
@@ -1,26 +1,51 @@
---- elilo/Make.defaults        2009-11-01 22:27:09.000000000 -0700
+--- elilo/Make.defaults        2010-06-08 13:26:54.651037891 -0600
 +++ /tmp/elilo-3.12/Make.defaults      2010-06-08 13:15:19.905132316 -0600
-@@ -62,8 +62,8 @@
+@@ -62,13 +62,15 @@
  CDIR    := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
  TOPDIR  =
  
--HOSTARCH   = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,)
--ARCH     := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32,)
+-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) 
  
-@@ -128,9 +128,9 @@
-       ARCH3264 = -m32
-       LD3264 = -melf_i386
+ OPTIMFLAGS = -O2 
+ DEBUGFLAGS = -Wall
+-CFLAGS     = $(OPTIMFLAGS) -fno-strict-aliasing -fpic -fshort-wchar $(DEBUGFLAGS)
++CFLAGS     = $(ARCH3264) $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
++ASFLAGS    = $(ARCH3264)
+ LDFLAGS          = -nostdlib -znocombreloc
+ INSTALL          = install
  
--      GNUEFILIB := /emul/ia32-linux$(GNUEFILIB)
--      EFILIB    := /emul/ia32-linux$(EFILIB)
--      EFICRT0   := /emul/ia32-linux$(EFICRT0)
+@@ -108,10 +110,30 @@
+ 
+ # 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
++  endif
++endif
++
+ ifeq ($(ARCH),ia64)
+  GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')