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.patch48
1 files changed, 23 insertions, 25 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 2293d7e938..efabc8febc 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 @@
1From 19d4c7f9812062a683b3ba60b35aac0461190456 Mon Sep 17 00:00:00 2001 1From 7675a67b8bb207de38ff5a9dc416e8b1028eb8ce 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/6] BaseTools: makefile: adjust to build in under bitbake 4Subject: [PATCH 2/4] 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.
@@ -14,58 +14,56 @@ to fight against how upstream wants to configure the build.
14Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> 14Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
15Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups] 15Upstream-Status: Inappropriate [needs to be converted to in-recipe fixups]
16--- 16---
17 BaseTools/Source/C/Makefiles/header.makefile | 17 +++++++++-------- 17 BaseTools/Source/C/Makefiles/header.makefile | 15 +++++++--------
18 1 file changed, 9 insertions(+), 8 deletions(-) 18 1 file changed, 7 insertions(+), 8 deletions(-)
19 19
20diff --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
21index 0df728f327..1299d47c87 100644 21index 1bf003523b..28757aed63 100644
22--- a/BaseTools/Source/C/Makefiles/header.makefile 22--- a/BaseTools/Source/C/Makefiles/header.makefile
23+++ b/BaseTools/Source/C/Makefiles/header.makefile 23+++ b/BaseTools/Source/C/Makefiles/header.makefile
24@@ -75,35 +75,36 @@ $(error Bad HOST_ARCH) 24@@ -82,35 +82,34 @@ $(error Bad HOST_ARCH)
25 endif 25 endif
26 26
27 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) 27 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
28-BUILD_CPPFLAGS = $(INCLUDE) 28-CPPFLAGS = $(INCLUDE)
29+BUILD_CPPFLAGS += $(INCLUDE) 29+CPPFLAGS += $(INCLUDE)
30 30
31 # keep EXTRA_OPTFLAGS last 31 # keep EXTRA_OPTFLAGS last
32 BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) 32 BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
33 33
34 ifeq ($(DARWIN),Darwin) 34 ifeq ($(DARWIN),Darwin)
35 # assume clang or clang compatible flags on OS X 35 # assume clang or clang compatible flags on OS X
36-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ 36-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
37+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \ 37+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror \
38 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g 38 -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
39 else 39 else
40 ifeq ($(CXX), llvm) 40 ifneq ($(CLANG),)
41-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 41-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
42+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 42+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
43 -fno-delete-null-pointer-checks -Wall -Werror \ 43 -fno-delete-null-pointer-checks -Wall -Werror \
44 -Wno-deprecated-declarations -Wno-self-assign \ 44 -Wno-deprecated-declarations -Wno-self-assign \
45 -Wno-unused-result -nostdlib -g 45 -Wno-unused-result -nostdlib -g
46 else 46 else
47-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 47-CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
48+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ 48+CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \
49 -fno-delete-null-pointer-checks -Wall -Werror \ 49 -fno-delete-null-pointer-checks -Wall -Werror \
50 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ 50 -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \
51 -Wno-unused-result -nostdlib -g 51 -Wno-unused-result -nostdlib -g
52 endif 52 endif
53 endif 53 endif
54 ifeq ($(CXX), llvm) 54 ifneq ($(CLANG),)
55-BUILD_LFLAGS = 55-LDFLAGS =
56-BUILD_CXXFLAGS = -Wno-deprecated-register -Wno-unused-result 56-CXXFLAGS = -Wno-deprecated-register -Wno-unused-result -std=c++14
57+BUILD_LFLAGS = $(LDFLAGS) 57+CXXFLAGS += -Wno-deprecated-register -Wno-unused-result -std=c++14
58+BUILD_CXXFLAGS += -Wno-deprecated-register -Wno-unused-result
59 else 58 else
60-BUILD_LFLAGS = 59-LDFLAGS =
61-BUILD_CXXFLAGS = -Wno-unused-result 60-CXXFLAGS = -Wno-unused-result
62+BUILD_LFLAGS = $(LDFLAGS) 61+CXXFLAGS += -Wno-unused-result
63+BUILD_CXXFLAGS += -Wno-unused-result
64 endif 62 endif
65+ 63+
66 ifeq ($(HOST_ARCH), IA32) 64 ifeq ($(HOST_ARCH), IA32)
67 # 65 #
68 # 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
69-- 67--
702.32.0 682.30.2
71 69
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 08:46:38 +0000