On Tue, Oct 18, 2016 at 12:21:02PM +0100, Wei Liu wrote: [...] > > > --- > > > ARM64: fix libxl build, do not include ../../xen/include > > > > > > Do not include ../../xen/include/ to build libxl_arm_acpi.c: header > > > files clashing against default headers under /usr/include are present in > > > that directory. > > > > > > Link only $(XEN_ROOT)/xen/include/acpi under tools/include instead. > > > > > > Build tested on ARM64 and x86_64. > > > > > > Signed-off-by: Stefano Stabellini <sstabell...@kernel.org> > > > > > > diff --git a/tools/include/Makefile b/tools/include/Makefile > > > index dec8b3d..d95d837 100644 > > > --- a/tools/include/Makefile > > > +++ b/tools/include/Makefile > > > @@ -20,6 +20,7 @@ xen/.dir: > > > ln -sf ../xen-sys/$(XEN_OS) xen/sys > > > ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) > > > xen/libelf/ > > > ln -s ../xen-foreign xen/foreign > > > + ln -s $(XEN_ROOT)/xen/include/acpi acpi > > > touch $@ > > > > > > # Not xen/xsm as that clashes with link to > > > diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile > > > index c4e4117..dac19ac 100644 > > > --- a/tools/libxl/Makefile > > > +++ b/tools/libxl/Makefile > > > @@ -96,7 +96,7 @@ dsdt_anycpu_arm.c: > > > $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) > > > > > > libxl_arm_acpi.o: libxl_arm_acpi.c > > > - $(CC) -c $(CFLAGS) -I../../xen/include/ -o $@ libxl_arm_acpi.c > > > + $(CC) -c $(CFLAGS) -o $@ libxl_arm_acpi.c > > > else > > > LIBXL_OBJS-$(CONFIG_ARM) += libxl_arm_no_acpi.o > > > endif > > > > Thanks Stefano, > > It hadn't occurred to me to add the acpi symlink :-). > > > > I can confirm that this fix works for me. > > > > Right. I will turn this into a Tested-by tag. Thanks for testing. > > > ( I think we just delete the libxl_arm_acpi.o build rule and rely on > > implicit make? ) > > > > Yes, that can be done. Patch is welcome. :-) >
I don't know why, but my arm64 chroot is broken at the moment (hangs from time to time, got TCG fatal error). I might submit a patch to change that if I manage to fix my arm64 chroot. Feel free to submit a patch to delete the explicit rule. In the mean time, I've applied this patch as-is so that it passes push-gate sooner. Wei. > Wei. > > > Cheers, > > -- > > Steve _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
