diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-12-07 11:59:46 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-12-07 16:12:33 -0500 |
commit | e675e3ebbfaf42686076fdf31562d499e3f6d189 (patch) | |
tree | fc6c4a246e449e882125ea9282f6652f68893829 /recipes-extended/kvmtool/files/external-crosscompiler.patch | |
parent | 3002a90c6d7b312e1c4d29bded29bb93d8b1dba6 (diff) | |
download | meta-virtualization-e675e3ebbfaf42686076fdf31562d499e3f6d189.tar.gz |
kvmtool: refresh crosscompiler patch
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/kvmtool/files/external-crosscompiler.patch')
-rw-r--r-- | recipes-extended/kvmtool/files/external-crosscompiler.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/recipes-extended/kvmtool/files/external-crosscompiler.patch b/recipes-extended/kvmtool/files/external-crosscompiler.patch index b8780245..e27ee34b 100644 --- a/recipes-extended/kvmtool/files/external-crosscompiler.patch +++ b/recipes-extended/kvmtool/files/external-crosscompiler.patch | |||
@@ -13,11 +13,11 @@ be linked against the cross-compiled libfdt library. | |||
13 | Makefile | 8 +------- | 13 | Makefile | 8 +------- |
14 | 1 file changed, 1 insertion(+), 7 deletions(-) | 14 | 1 file changed, 1 insertion(+), 7 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile b/Makefile | 16 | Index: git/Makefile |
17 | index e9121dc..c05b2c0 100644 | 17 | =================================================================== |
18 | --- a/Makefile | 18 | --- git.orig/Makefile |
19 | +++ b/Makefile | 19 | +++ git/Makefile |
20 | @@ -19,12 +19,6 @@ include config/utilities.mak | 20 | @@ -19,12 +19,6 @@ |
21 | include config/feature-tests.mak | 21 | include config/feature-tests.mak |
22 | -include $(OUTPUT)KVMTOOLS-VERSION-FILE | 22 | -include $(OUTPUT)KVMTOOLS-VERSION-FILE |
23 | 23 | ||
@@ -30,12 +30,12 @@ index e9121dc..c05b2c0 100644 | |||
30 | FIND := find | 30 | FIND := find |
31 | CSCOPE := cscope | 31 | CSCOPE := cscope |
32 | TAGS := ctags | 32 | TAGS := ctags |
33 | @@ -343,7 +337,7 @@ $(warning No static libc found. Skipping guest init) | 33 | @@ -367,7 +361,7 @@ |
34 | endif | 34 | CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT |
35 | 35 | CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT | |
36 | ifeq (y,$(ARCH_WANT_LIBFDT)) | 36 | CFLAGS += -I $(LIBFDT_DIR) |
37 | - ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y) | 37 | - else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y) |
38 | + ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y) | 38 | + else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y) |
39 | $(error No libfdt found. Please install libfdt-dev package) | 39 | LIBFDT_STATIC := |
40 | else | ||
41 | CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT | 40 | CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT |
41 | CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT | ||