c/s 4664034cd replaced a glob over include/*.h with an expectation that
LIBHEADER was suitably set for libraries which didn't have a single,
consistently named, header file.
This wasn't true for xentoolcore, which lost xentoolcore_internal.h as a
consequence, and failed an API/ABI check vs 4.14
Fixes: 4664034cd ("tools/libs: move official headers to common directory")
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Ian Jackson <i...@xenproject.org>
CC: Wei Liu <w...@xen.org>
CC: Juergen Gross <jgr...@suse.com>
For 4.15. This is a regression from 4.14, even if AFAICT it only impacts the
ABI checking at this point.
I *think* this is the only impacted library, but I would appreciate a second
pair of eyes.
I did experiment with this:
+ifeq ($(LIBHEADER),)
+$(warning $(LIBNAME) - No headers)
+endif
LIBHEADER ?= $(LIB_FILE_NAME).h
LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h))
which yields:
andrewcoop@andrewcoop:/local/xen.git$ make -j4 -s -C tools/libs/
/local/xen.git/tools/libs/toollog/../../../tools/libs/libs.mk:50: toollog -
No headers
/local/xen.git/tools/libs/evtchn/../../../tools/libs/libs.mk:50: evtchn - No
headers
/local/xen.git/tools/libs/gnttab/../../../tools/libs/libs.mk:50: gnttab - No
headers
/local/xen.git/tools/libs/call/../../../tools/libs/libs.mk:50: call - No
headers
/local/xen.git/tools/libs/foreignmemory/../../../tools/libs/libs.mk:50:
foreignmemory - No headers
/local/xen.git/tools/libs/devicemodel/../../../tools/libs/libs.mk:50:
devicemodel - No headers
../libs.mk:50: hypfs - No headers
/local/xen.git/tools/libs/stat/../../../tools/libs/libs.mk:50: stat - No
headers
/local/xen.git/tools/libs/stat/../../../tools/libs/libs.mk:50: stat - No
headers
Headers aside for a moment, there are two bugs here. hypfs doesn't use the
same include pattern as the others, and stat is entered twice.
---
tools/libs/toolcore/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/libs/toolcore/Makefile b/tools/libs/toolcore/Makefile
index 1cf30733c9..3550786491 100644
--- a/tools/libs/toolcore/Makefile
+++ b/tools/libs/toolcore/Makefile
@@ -5,6 +5,8 @@ MAJOR = 1
MINOR = 0
AUTOINCS := $(XEN_INCLUDE)/_xentoolcore_list.h
+LIBHEADER := xentoolcore.h xentoolcore_internal.h
+
SRCS-y += handlereg.c
include $(XEN_ROOT)/tools/libs/libs.mk
--
2.11.0
