summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
diff options
context:
space:
mode:
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.patch58
1 files changed, 30 insertions, 28 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 c61a08f022..eeedc9e20f 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,67 +1,69 @@
1From 667c0cf97dadc4f5994d26ec3984f559a05ec406 Mon Sep 17 00:00:00 2001 1From ac9df4fb92965f1f95a5bdbde5f2f86d0c569711 Mon Sep 17 00:00:00 2001
2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> 2From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
3Date: Fri, 26 Jul 2019 17:34:26 -0400 3Date: Fri, 26 Jul 2019 17:34:26 -0400
4Subject: [PATCH 2/4] BaseTools: makefile: adjust to build in under bitbake 4Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake
5 5
6Prepend the build flags with those of bitbake. This is to build 6Prepend the build flags with those of bitbake. This is to build
7using the bitbake native sysroot include and library directories. 7using the bitbake native sysroot include and library directories.
8 8
9Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> 9Note from Alex: this is not appropriate for upstream submission as
10Upstream-Status: Pending 10the recipe already does lots of similar in-place fixups elsewhere, so
11this patch shold be converted to follow that pattern. We're not going
12to fight against how upstream wants to configure the build.
11 13
14Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
15Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
12--- 16---
13 BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- 17 BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++--------
14 1 file changed, 9 insertions(+), 8 deletions(-) 18 1 file changed, 7 insertions(+), 8 deletions(-)
15 19
16diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile 20diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
17index 1c105ee7d4..d5eea3864e 100644 21index d369908a09..22c670f316 100644
18--- a/BaseTools/Source/C/Makefiles/header.makefile 22--- a/BaseTools/Source/C/Makefiles/header.makefile
19+++ b/BaseTools/Source/C/Makefiles/header.makefile 23+++ b/BaseTools/Source/C/Makefiles/header.makefile
20@@ -69,35 +69,36 @@ $(error Bad HOST_ARCH) 24@@ -85,35 +85,34 @@ endif
21 endif
22 25
23 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) 26 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
24-BUILD_CPPFLAGS = $(INCLUDE) 27 INCLUDE += -I $(EDK2_PATH)/MdePkg/Include
25+BUILD_CPPFLAGS += $(INCLUDE) 28-CPPFLAGS = $(INCLUDE)
29+CPPFLAGS += $(INCLUDE)
26 30
27 # keep EXTRA_OPTFLAGS last 31 # keep EXTRA_OPTFLAGS last
28 BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) 32 BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
29 33
30 ifeq ($(DARWIN),Darwin) 34 ifeq ($(DARWIN),Darwin)
31 # assume clang or clang compatible flags on OS X 35 # assume clang or clang compatible flags on OS X
32-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ 36-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
33+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ 37+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
34 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g 38 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
35 else 39 else
36 ifeq ($(CXX), llvm) 40 ifneq ($(CLANG),)
37-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 41-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
38+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 42+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
39 -fno-delete-null-pointer-checks -Wall -Werror \ 43 -fno-delete-null-pointer-checks -Wall -Werror \
40 -Wno-deprecated-declarations -Wno-self-assign \ 44 -Wno-deprecated-declarations -Wno-self-assign \
41 -Wno-unused-result -nostdlib -g 45 -Wno-unused-result -nostdlib -g
42 else 46 else
43-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 47-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
44+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 48+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
45 -fno-delete-null-pointer-checks -Wall -Werror \ 49 -fno-delete-null-pointer-checks -Wall -Werror \
46 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ 50 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
47 -Wno-unused-result -nostdlib -g 51 -Wno-unused-result -nostdlib -g
48 endif 52 endif
49 endif 53 endif
50 ifeq ($(CXX), llvm) 54 ifneq ($(CLANG),)
51-BUILD_LFLAGS = 55-LDFLAGS =
52-BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result 56-CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -std=c++14
53+BUILD_LFLAGS = $(LDFLAGS) 57+CXXFLAGS += -Wno-deprecated-register -Wno-unused-result -std=c++14
54+BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result
55 else 58 else
56-BUILD_LFLAGS = 59-LDFLAGS =
57-BUILD_CXXFLAGS = -Wno-unused-result 60-CXXFLAGS = -Wno-unused-result
58+BUILD_LFLAGS = $(LDFLAGS) 61+CXXFLAGS += -Wno-unused-result
59+BUILD_CXXFLAGS += -Wno-unused-result
60 endif 62 endif
61+ 63+
62 ifeq ($(HOST_ARCH), IA32) 64 ifeq ($(HOST_ARCH), IA32)
63 # 65 #
64 # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults 66 # Snow Leopard is a 32-bit and 64-bit environment. uname -m returns i386, but gcc defaults
65-- 67--
662.28.0 682.30.2
67 69
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-13 11:47:11 +0000