From: Wei Liu <wei.liu2@citrix.com>
To: Steve Capper <steve.capper@linaro.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>, Wei Chen <wei.chen@arm.com>,
Steve Capper <steve.capper@arm.com>,
Julien Grall <julien.grall@arm.com>,
Jan Beulich <JBeulich@suse.com>,
Shannon Zhao <zhaoshenglong@huawei.com>,
Xen-devel <xen-devel@lists.xenproject.org>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>
Subject: Re: [PATCH for-4.8 1/3] libacpi: fix arm64 build
Date: Tue, 18 Oct 2016 12:43:28 +0100 [thread overview]
Message-ID: <20161018114328.GL23219@citrix.com> (raw)
In-Reply-To: <20161018112102.GK23219@citrix.com>
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 <sstabellini@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
next prev parent reply other threads:[~2016-10-18 11:43 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 17:02 [PATCH for-4.8 0/3] libacpi fixes Wei Liu
2016-10-14 17:02 ` [PATCH for-4.8 1/3] libacpi: fix arm64 build Wei Liu
2016-10-17 10:47 ` Wei Liu
2016-10-17 14:57 ` Steve Capper
2016-10-17 16:55 ` Wei Liu
2016-10-17 23:36 ` Stefano Stabellini
2016-10-18 7:52 ` Steve Capper
2016-10-18 11:21 ` Wei Liu
2016-10-18 11:43 ` Wei Liu [this message]
2016-10-18 11:17 ` Wei Liu
2016-10-14 17:02 ` [PATCH for-4.8 2/3] libacpi: require ACPI_BUILD_DIR to be set Wei Liu
2016-10-24 12:48 ` Jan Beulich
2016-10-14 17:02 ` [PATCH for-4.8 3/3] libacpi: add back the "G" in "GNU" in licence header Wei Liu
2016-10-14 17:19 ` [PATCH for-4.8 0/3] libacpi fixes Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161018114328.GL23219@citrix.com \
--to=wei.liu2@citrix.com \
--cc=JBeulich@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=julien.grall@arm.com \
--cc=sstabellini@kernel.org \
--cc=steve.capper@arm.com \
--cc=steve.capper@linaro.org \
--cc=wei.chen@arm.com \
--cc=xen-devel@lists.xenproject.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.