diff options
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch')
-rw-r--r-- | meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index f37ed018ab..c61a08f022 100644 --- a/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001 | 1 | From 667c0cf97dadc4f5994d26ec3984f559a05ec406 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> |
3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 | 3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 |
4 | Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake | 4 | Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake |
5 | 5 | ||
6 | Prepend the build flags with those of bitbake. This is to build | 6 | Prepend the build flags with those of bitbake. This is to build |
7 | using the bitbake native sysroot include and library directories. | 7 | using the bitbake native sysroot include and library directories. |
@@ -10,14 +10,14 @@ Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | |||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
11 | 11 | ||
12 | --- | 12 | --- |
13 | BaseTools/Source/C/Makefiles/header.makefile | 10 +++++----- | 13 | BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- |
14 | 1 file changed, 5 insertions(+), 5 deletions(-) | 14 | 1 file changed, 9 insertions(+), 8 deletions(-) |
15 | 15 | ||
16 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | 16 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile |
17 | index 4e9b36d98b..eb03ee33fa 100644 | 17 | index 1c105ee7d4..d5eea3864e 100644 |
18 | --- a/BaseTools/Source/C/Makefiles/header.makefile | 18 | --- a/BaseTools/Source/C/Makefiles/header.makefile |
19 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | 19 | +++ b/BaseTools/Source/C/Makefiles/header.makefile |
20 | @@ -62,23 +62,23 @@ $(error Bad HOST_ARCH) | 20 | @@ -69,35 +69,36 @@ $(error Bad HOST_ARCH) |
21 | endif | 21 | endif |
22 | 22 | ||
23 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) | 23 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) |
@@ -33,19 +33,35 @@ index 4e9b36d98b..eb03ee33fa 100644 | |||
33 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ | 33 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ |
34 | -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g | 34 | -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g |
35 | else | 35 | else |
36 | ifeq ($(CXX), llvm) | ||
37 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | ||
38 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | ||
39 | -fno-delete-null-pointer-checks -Wall -Werror \ | ||
40 | -Wno-deprecated-declarations -Wno-self-assign \ | ||
41 | -Wno-unused-result -nostdlib -g | ||
42 | else | ||
36 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 43 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
37 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | 44 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ |
38 | -fno-delete-null-pointer-checks -Wall -Werror \ | 45 | -fno-delete-null-pointer-checks -Wall -Werror \ |
39 | -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ | 46 | -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ |
40 | -Wno-unused-result -nostdlib -g | 47 | -Wno-unused-result -nostdlib -g |
41 | endif | 48 | endif |
49 | endif | ||
50 | ifeq ($(CXX), llvm) | ||
51 | -BUILD_LFLAGS = | ||
52 | -BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result | ||
53 | +BUILD_LFLAGS = $(LDFLAGS) | ||
54 | +BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result | ||
55 | else | ||
42 | -BUILD_LFLAGS = | 56 | -BUILD_LFLAGS = |
43 | -BUILD_CXXFLAGS = -Wno-unused-result | 57 | -BUILD_CXXFLAGS = -Wno-unused-result |
44 | +BUILD_LFLAGS = $(LDFLAGS) | 58 | +BUILD_LFLAGS = $(LDFLAGS) |
45 | +BUILD_CXXFLAGS += -Wno-unused-result | 59 | +BUILD_CXXFLAGS += -Wno-unused-result |
46 | 60 | endif | |
61 | + | ||
47 | ifeq ($(HOST_ARCH), IA32) | 62 | ifeq ($(HOST_ARCH), IA32) |
48 | # | 63 | # |
64 | # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults | ||
49 | -- | 65 | -- |
50 | 2.17.1 | 66 | 2.28.0 |
51 | 67 | ||