From e675e3ebbfaf42686076fdf31562d499e3f6d189 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 7 Dec 2022 11:59:46 -0500 Subject: kvmtool: refresh crosscompiler patch Signed-off-by: Bruce Ashfield --- .../kvmtool/files/external-crosscompiler.patch | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'recipes-extended') 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. Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -diff --git a/Makefile b/Makefile -index e9121dc..c05b2c0 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,12 +19,6 @@ include config/utilities.mak +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -19,12 +19,6 @@ include config/feature-tests.mak -include $(OUTPUT)KVMTOOLS-VERSION-FILE @@ -30,12 +30,12 @@ index e9121dc..c05b2c0 100644 FIND := find CSCOPE := cscope TAGS := ctags -@@ -343,7 +337,7 @@ $(warning No static libc found. Skipping guest init) - endif - - ifeq (y,$(ARCH_WANT_LIBFDT)) -- ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y) -+ ifneq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y) - $(error No libfdt found. Please install libfdt-dev package) - else +@@ -367,7 +361,7 @@ + CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT + CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT + CFLAGS += -I $(LIBFDT_DIR) +- else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CFLAGS),-lfdt),y) ++ else ifeq ($(call try-build,$(SOURCE_LIBFDT),$(CPPFLAGS) $(CFLAGS),-lfdt),y) + LIBFDT_STATIC := CFLAGS_DYNOPT += -DCONFIG_HAS_LIBFDT + CFLAGS_STATOPT += -DCONFIG_HAS_LIBFDT -- cgit v1.2.3-54-g00ecf