rpms/gnu-efi
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to fix the build on arm*v*7

Browse Source 
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2017-02-02 14:48:41 -05:00
parent 7d430a60e6
commit 6fdce6c226
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0003-Fix-arm-build-paths-in-the-makefile.patch
View File

@ -1,4 +1,4 @@
From 5c468c2935e3607edd715ae799520c0c97d6ab06 Mon Sep 17 00:00:00 2001 From 20ca4c5a0049aa6d2c647b8512cf1d33f3c1bc35 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com> From: Peter Jones <pjones@redhat.com>
Date: Thu, 2 Feb 2017 14:31:25 -0500 Date: Thu, 2 Feb 2017 14:31:25 -0500
Subject: [PATCH] Fix arm build paths in the makefile Subject: [PATCH] Fix arm build paths in the makefile
@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Make.defaults b/Make.defaults diff --git a/Make.defaults b/Make.defaults
index 51bd7d8..1815b90 100755 index 51bd7d8..5b6d179 100755
--- a/Make.defaults --- a/Make.defaults
+++ b/Make.defaults +++ b/Make.defaults
@@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy @@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy
@ -17,13 +17,13 @@ index 51bd7d8..1815b90 100755
# Host/target identification # Host/target identification
OS := $(shell uname -s) 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 s,i[3456789]86,ia32,)
+HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e s,arm7.*,arm, ) +HOSTARCH := $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e s,armv7.*,arm, )
ARCH := $(HOSTARCH) ARCH := $(HOSTARCH)
# Get ARCH from the compiler if cross compiling # Get ARCH from the compiler if cross compiling
ifneq ($(CROSS_COMPILE),) 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 s,i[3456789]86,ia32,)
+ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e s,arm7.*,arm, ) + override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e s,armv7.*,arm, )
endif endif
# FreeBSD (and possibly others) reports amd64 instead of x86_64 # FreeBSD (and possibly others) reports amd64 instead of x86_64