-Description: Upstream changes introduced in version 3.12-3
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- elilo (3.12-3) unstable; urgency=low
- .
- * fix paths and options to build both 32 and 64 bit versions on either
- flavor of build host, closes: #574713
- * don't generate noise when following symlink since that's now the normal
- situation, closes: #581068
- .
- The person named in the Author field signed this changelog entry.
-Author: Bdale Garbee <bdale@gag.com>
-Bug-Debian: http://bugs.debian.org/574713
-Bug-Debian: http://bugs.debian.org/581068
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- elilo-3.12.orig/Makefile
-+++ elilo-3.12/Makefile
+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
++++ b/Makefile