| Message ID | 20210212153953.4582-11-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tools: Support to use abi-dumper on libraries | expand |
On 12.02.2021 16:39, Andrew Cooper wrote: > --- a/tools/libs/libs.mk > +++ b/tools/libs/libs.mk > @@ -49,6 +49,8 @@ PKG_CONFIG_LOCAL := $(PKG_CONFIG_DIR)/$(PKG_CONFIG) > LIBHEADER ?= $(LIB_FILE_NAME).h > LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h)) > > +PKG_ABI := lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR)-$(XEN_COMPILE_ARCH)-abi.dump Don't you mean $(XEN_TARGET_ARCH) here? Jan
On 12/02/2021 16:12, Jan Beulich wrote: > On 12.02.2021 16:39, Andrew Cooper wrote: >> --- a/tools/libs/libs.mk >> +++ b/tools/libs/libs.mk >> @@ -49,6 +49,8 @@ PKG_CONFIG_LOCAL := $(PKG_CONFIG_DIR)/$(PKG_CONFIG) >> LIBHEADER ?= $(LIB_FILE_NAME).h >> LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h)) >> >> +PKG_ABI := lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR)-$(XEN_COMPILE_ARCH)-abi.dump > Don't you mean $(XEN_TARGET_ARCH) here? Yes, I do. Will fix up. Thanks, ~Andrew
Andrew Cooper writes ("[PATCH 10/10] tools/libs: Write out an ABI analysis when abi-dumper is available"):
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Andrew Cooper writes ("[PATCH 10/10] tools/libs: Write out an ABI analysis when abi-dumper is available"):
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
...
> +# If abi-dumper is available, write out the ABI analysis
> +ifneq ($(ABI_DUMPER),)
> +libs: $(PKG_ABI)
> +$(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst
> + abi-dumper $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR)
> +endif
Kind of annoying that we don't have a variable for
lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR)
Reviewed-by: Ian Jackson <iwj@xenproject.org>
diff --git a/tools/libs/libs.mk b/tools/libs/libs.mk index ac68996ab2..2a4ce8a90c 100644 --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -49,6 +49,8 @@ PKG_CONFIG_LOCAL := $(PKG_CONFIG_DIR)/$(PKG_CONFIG) LIBHEADER ?= $(LIB_FILE_NAME).h LIBHEADERS = $(foreach h, $(LIBHEADER), $(XEN_INCLUDE)/$(h)) +PKG_ABI := lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR)-$(XEN_COMPILE_ARCH)-abi.dump + $(PKG_CONFIG_LOCAL): PKG_CONFIG_PREFIX = $(XEN_ROOT) $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_INCLUDE) $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) @@ -94,6 +96,13 @@ lib$(LIB_FILE_NAME).so.$(MAJOR): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxen$(LIBNAME).map $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,lib$(LIB_FILE_NAME).so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(LDUSELIBS) $(APPEND_LDFLAGS) +# If abi-dumper is available, write out the ABI analysis +ifneq ($(ABI_DUMPER),) +libs: $(PKG_ABI) +$(PKG_ABI): lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR) headers.lst + abi-dumper $< -o $@ -public-headers headers.lst -lver $(MAJOR).$(MINOR) +endif + .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(libdir)
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Ian Jackson <iwj@xenproject.org> CC: Wei Liu <wl@xen.org> CC: Juergen Gross <jgross@suse.com> --- tools/libs/libs.mk | 9 +++++++++ 1 file changed, 9 insertions(+)