[Xen-devel] [PATCH] tools/libs: Fix build following c/s 56dccee3f, take 2

Andrew Cooper posted 1 patch 6 years, 1 month ago
Failed in applying to current master (apply log)
tools/libs/toolcore/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[Xen-devel] [PATCH] tools/libs: Fix build following c/s 56dccee3f, take 2
Posted by Andrew Cooper 6 years, 1 month ago
The fix for c/s 01ba8f62b618 was speculative given no local repro.  It turns
out that it didn't fix the problem.

The $(AUTOINCS) variable needs to be visible before libs.mk is included, to
have any effect.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Jackson <Ian.Jackson@citrix.com>
CC: Wei Liu <wl@xen.org>
CC: Juergen Gross <jgross@suse.com>
---
 tools/libs/toolcore/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile
index edce61dca4..9c5a92d93f 100644
--- a/tools/libs/toolcore/Makefile
+++ b/tools/libs/toolcore/Makefile
@@ -4,6 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 MAJOR	= 1
 MINOR	= 0
 LIBNAME  := toolcore
+AUTOINCS := include/_xentoolcore_list.h
 
 SRCS-y	+= handlereg.c
 
@@ -11,8 +12,6 @@ include $(XEN_ROOT)/tools/libs/libs.mk
 
 $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_LIBXENTOOLCORE)/include
 
-AUTOINCS=include/_xentoolcore_list.h
-
 $(LIB_OBJS): $(AUTOINCS)
 $(PIC_OBJS): $(AUTOINCS)
 
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH] tools/libs: Fix build following c/s 56dccee3f, take 2
Posted by Ian Jackson 6 years, 1 month ago
Andrew Cooper writes ("[PATCH] tools/libs: Fix build following c/s 56dccee3f, take 2"):
> The fix for c/s 01ba8f62b618 was speculative given no local repro.  It turns
> out that it didn't fix the problem.
> 
> The $(AUTOINCS) variable needs to be visible before libs.mk is included, to
> have any effect.

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

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel