diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-06-10 01:39:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-14 10:23:27 +0100 |
commit | 89c12fc8de6b80e0e9add7f012553eb4e38dac7f (patch) | |
tree | a3060283179d710656ce0b3763acd46481dbc03f /meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |
parent | ed0ecc7b76698707529dcc3a765c037b7976de93 (diff) | |
download | poky-89c12fc8de6b80e0e9add7f012553eb4e38dac7f.tar.gz |
ovmf: Update to latest
Fix build with gcc7
clang can not compile it therefore mark it gcc only recipe
(From OE-Core rev: 835b705ee92900f0d73cee612ce790fde4b1e2a4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch')
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index 0fdc278ce2..1f8332ef56 100644 --- a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |||
@@ -11,29 +11,28 @@ Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | |||
11 | BaseTools/Source/C/Makefiles/header.makefile | 8 ++++---- | 11 | BaseTools/Source/C/Makefiles/header.makefile | 8 ++++---- |
12 | 1 file changed, 4 insertions(+), 4 deletions(-) | 12 | 1 file changed, 4 insertions(+), 4 deletions(-) |
13 | 13 | ||
14 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | 14 | Index: git/BaseTools/Source/C/Makefiles/header.makefile |
15 | index 821d114..fe0f08b 100644 | 15 | =================================================================== |
16 | --- a/BaseTools/Source/C/Makefiles/header.makefile | 16 | --- git.orig/BaseTools/Source/C/Makefiles/header.makefile |
17 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | 17 | +++ git/BaseTools/Source/C/Makefiles/header.makefile |
18 | @@ -44,14 +44,14 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/ | 18 | @@ -44,15 +44,15 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AA |
19 | endif | 19 | endif |
20 | 20 | ||
21 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) | 21 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) |
22 | -BUILD_CPPFLAGS = $(INCLUDE) -O2 | 22 | -BUILD_CPPFLAGS = $(INCLUDE) -O2 |
23 | +BUILD_CPPFLAGS := $(BUILD_CPPFLAGS) $(INCLUDE) -O2 | 23 | +BUILD_CPPFLAGS += $(INCLUDE) -O2 |
24 | ifeq ($(DARWIN),Darwin) | 24 | ifeq ($(DARWIN),Darwin) |
25 | # assume clang or clang compatible flags on OS X | 25 | # assume clang or clang compatible flags on OS X |
26 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g | 26 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g |
27 | +BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g | 27 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g |
28 | else | 28 | else |
29 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g | 29 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g |
30 | +BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g | 30 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g |
31 | endif | 31 | endif |
32 | -BUILD_LFLAGS = | 32 | -BUILD_LFLAGS = |
33 | +BUILD_LFLAGS := $(LDFLAGS) | 33 | -BUILD_CXXFLAGS = -Wno-unused-result |
34 | BUILD_CXXFLAGS = | 34 | +BUILD_LFLAGS = $(LDFLAGS) |
35 | +BUILD_CXXFLAGS += -Wno-unused-result | ||
35 | 36 | ||
36 | ifeq ($(ARCH), IA32) | 37 | ifeq ($(ARCH), IA32) |
37 | -- | 38 | # |
38 | 2.9.3 | ||
39 | |||