[Xen-changelog] [xen staging] tools/libs: Fix build following c/s 56dccee3f

[patchbot@xxxxxxx]

commit 01ba8f62b618098a8880673e97e73af62c7f51bc
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Tue Sep 17 18:39:14 2019 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Sep 17 19:00:24 2019 +0100

    tools/libs: Fix build following c/s 56dccee3f
    
    Travis reports:
    
      make subdirs-install
      make[2]: Entering directory `/home/travis/build/andyhhp/xen/tools'
      make[3]: Entering directory `/home/travis/build/andyhhp/xen/tools'
      make -C libs install
      make[4]: Entering directory `/home/travis/build/andyhhp/xen/tools/libs'
      make[5]: Entering directory `/home/travis/build/andyhhp/xen/tools/libs'
      make -C toolcore install
      make[6]: Entering directory 
`/home/travis/build/andyhhp/xen/tools/libs/toolcore'
      make libs
      make[7]: Entering 
directory`/home/travis/build/andyhhp/xen/tools/libs/toolcore'
      for i in include/xentoolcore.h include/xentoolcore_internal.h; do \
              gcc -x c -ansi -Wall -Werror 
-I<snip>/xen/tools/libs/toolcore/../../../tools/include \
                        -S -o /dev/null $i || exit 1; \
                            echo $i; \
                            done >headers.chk.new
      include/xentoolcore_internal.h:30:31: fatal error: _xentoolcore_list.h: 
No such file or directory
       #include "_xentoolcore_list.h"
                                     ^
      compilation terminated.
      make[7]: *** [headers.chk] Error 1
    
    The problem is that xentoolcore_internal.h includes _xentoolcore_list.h 
which
    hasn't been generated yet.
    
    The toolcore headers.chk rule (unlike the other libraries) had an additional
    dependency against $(AUTOINCS), which forced the headers to be generated
    first.  Replicate this in the common libs.mk
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libs/libs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk
index b680087653..8027ae7400 100644
--- a/tools/libs/libs.mk
+++ b/tools/libs/libs.mk
@@ -47,7 +47,7 @@ build:
 .PHONY: libs
 libs: headers.chk $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL)
 
-headers.chk: $(wildcard include/*.h)
+headers.chk: $(wildcard include/*.h) $(AUTOINCS)
 
 libxen$(LIBNAME).a: $(LIB_OBJS)
        $(AR) rc $@ $^
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog