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 | 51 |
1 files changed, 51 insertions, 0 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 new file mode 100644 index 0000000000..f37ed018ab --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0002-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From a8bceaec1b16fffbf6810df05503d8ae9092b735 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | ||
| 3 | Date: Fri, 26 Jul 2019 17:34:26 -0400 | ||
| 4 | Subject: [PATCH 2/5] BaseTools: makefile: adjust to build in under bitbake | ||
| 5 | |||
| 6 | Prepend the build flags with those of bitbake. This is to build | ||
| 7 | using the bitbake native sysroot include and library directories. | ||
| 8 | |||
| 9 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | ||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | --- | ||
| 13 | BaseTools/Source/C/Makefiles/header.makefile | 10 +++++----- | ||
| 14 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | ||
| 17 | index 4e9b36d98b..eb03ee33fa 100644 | ||
| 18 | --- a/BaseTools/Source/C/Makefiles/header.makefile | ||
| 19 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | ||
| 20 | @@ -62,23 +62,23 @@ $(error Bad HOST_ARCH) | ||
| 21 | endif | ||
| 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) | ||
| 24 | -BUILD_CPPFLAGS = $(INCLUDE) | ||
| 25 | +BUILD_CPPFLAGS += $(INCLUDE) | ||
| 26 | |||
| 27 | # keep EXTRA_OPTFLAGS last | ||
| 28 | BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) | ||
| 29 | |||
| 30 | ifeq ($(DARWIN),Darwin) | ||
| 31 | # assume clang or clang compatible flags on OS X | ||
| 32 | -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 | ||
| 35 | else | ||
| 36 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | ||
| 37 | +BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -fwrapv \ | ||
| 38 | -fno-delete-null-pointer-checks -Wall -Werror \ | ||
| 39 | -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict \ | ||
| 40 | -Wno-unused-result -nostdlib -g | ||
| 41 | endif | ||
| 42 | -BUILD_LFLAGS = | ||
| 43 | -BUILD_CXXFLAGS = -Wno-unused-result | ||
| 44 | +BUILD_LFLAGS = $(LDFLAGS) | ||
| 45 | +BUILD_CXXFLAGS += -Wno-unused-result | ||
| 46 | |||
| 47 | ifeq ($(HOST_ARCH), IA32) | ||
| 48 | # | ||
| 49 | -- | ||
| 50 | 2.17.1 | ||
| 51 | |||