From 7d430a60e6bd4c8977a25e694bcccd7525b571fe Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 2 Feb 2017 14:33:56 -0500 Subject: [PATCH] Attempt to fix the build on arm7 Signed-off-by: Peter Jones --- ...-Fix-arm-build-paths-in-the-makefile.patch | 32 +++++++++++++++++++ gnu-efi.spec | 1 + 2 files changed, 33 insertions(+) create mode 100644 0003-Fix-arm-build-paths-in-the-makefile.patch diff --git a/0003-Fix-arm-build-paths-in-the-makefile.patch b/0003-Fix-arm-build-paths-in-the-makefile.patch new file mode 100644 index 0000000..9d333f0 --- /dev/null +++ b/0003-Fix-arm-build-paths-in-the-makefile.patch @@ -0,0 +1,32 @@ +From 5c468c2935e3607edd715ae799520c0c97d6ab06 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 2 Feb 2017 14:31:25 -0500 +Subject: [PATCH] Fix arm build paths in the makefile + +Signed-off-by: Peter Jones +--- + Make.defaults | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index 51bd7d8..1815b90 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy + + # Host/target identification + OS := $(shell uname -s) +-HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) ++HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e s,arm7.*,arm, ) + ARCH := $(HOSTARCH) + + # Get ARCH from the compiler if cross compiling + ifneq ($(CROSS_COMPILE),) +- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed s,i[3456789]86,ia32,) ++ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e s,arm7.*,arm, ) + endif + + # FreeBSD (and possibly others) reports amd64 instead of x86_64 +-- +2.9.3 + diff --git a/gnu-efi.spec b/gnu-efi.spec index d63fb4d..500aa19 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -13,6 +13,7 @@ Source: http://superb-dca2.dl.sourceforge.net/project/gnu-efi/gnu-efi-%{version} Patch0001: 0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch Patch0002: 0002-Fix-some-types-gcc-doesn-t-like.patch +Patch0003: 0003-Fix-arm-build-paths-in-the-makefile.patch %define debug_package %{nil}