[PATCH] fix build with make 3.81

Juergen Gross posted 1 patch 3 years, 7 months ago
Failed in applying to current master (apply log)
stubdom/Makefile | 2 +-
tools/Rules.mk   | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[PATCH] fix build with make 3.81
Posted by Juergen Gross 3 years, 7 months ago
make 3.81 doesn't support multiline variables defined with

 define var =
 ...
 endef

Dropping the "=" in the first line will fix the issue.

Fixes: ded08cdfa72bb ("tools: generate most contents of library make variables")
Fixes: ddb2934a914df ("stubdom: add correct dependencies for Xen libraries")
Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
 stubdom/Makefile | 2 +-
 tools/Rules.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 4fd86dd44b..98eba8efe3 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -25,7 +25,7 @@ endif
 
 include $(XEN_ROOT)/tools/libs/uselibs.mk
 
-define LIB_deps =
+define LIB_deps
  LIBDEPS_$(1) = $$(foreach use,$$(USELIBS_$(1)),libxen$$(use))
 endef
 $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_deps,$(lib))))
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 7e019a8a65..385807a71c 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -94,7 +94,7 @@ endif
 # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or
 # $(SHLIB_libfoo)
 
-define LIB_defs =
+define LIB_defs
  XEN_libxen$(1) = $$(XEN_ROOT)/tools/libs/$(1)
  CFLAGS_libxen$(1) = -I$$(XEN_libxen$(1))/include $$(CFLAGS_xeninclude)
  SHDEPS_libxen$(1) = $$(foreach use,$$(USELIBS_$(1)),$$(SHLIB_libxen$$(use)))
-- 
2.26.2


Re: [PATCH] fix build with make 3.81
Posted by Ian Jackson 3 years, 7 months ago
Juergen Gross writes ("[PATCH] fix build with make 3.81"):
> make 3.81 doesn't support multiline variables defined with
> 
>  define var =
>  ...
>  endef

Reviewed-by: Ian Jackson <ian.jackson@eu.citrix.com>

And commited, thanks.

Ian.