Re: [PATCH] stubdom: simplify and fix Makefile

[Wei Liu <wei.liu2@citrix.com>]

On Fri, Nov 04, 2016 at 03:29:01PM +0100, Juergen Gross wrote:
> On 04/11/16 15:20, Wei Liu wrote:
> > On Fri, Nov 04, 2016 at 10:53:29AM +0100, Juergen Gross wrote:
> >> The stubdom Makefile is setting up links for various libraries. This
> >> is done only once when qemu links are created and each library's links
> >> are updated/created only if the link for the Makefile of the library
> >> isn't already existing. In case a source is added to one library after
> >> doing the first make of stubdom the new source won't be linked by a
> >> new call of make.
> >>
> > 
> > I think this is a bug, hence I intend to take this patch in 4.8.
> 
> I wouldn't mind. OTOH this bug will surface only when modifying the
> code, so it isn't a severe one. Normally you'll notice a build error
> which will be gone after cleaning the tree.
> 

Alright. If you don't feel strongly about this, I'm fine with putting it
to my -next branch, too.

> 
> Juergen
> 
> > 
> >> Instead of testing the existence of the Makefile link use a make
> >> dependency which will catch changes of the linked Makefile, too.
> >>
> >> At the same time don't repeat the same link pattern 7 times but use a
> >> make macro to do the linking.
> >>
> >> Signed-off-by: Juergen Gross <jgross@suse.com>
> >> ---
> >>  stubdom/Makefile | 77 ++++++++++++++++++++++++++------------------------------
> >>  1 file changed, 35 insertions(+), 42 deletions(-)
> >>
> >> diff --git a/stubdom/Makefile b/stubdom/Makefile
> >> index 2921f30..9b30b58 100644
> >> --- a/stubdom/Makefile
> >> +++ b/stubdom/Makefile
> >> @@ -305,7 +305,41 @@ ioemu/linkfarm.stamp:
> >>  	touch ioemu/linkfarm.stamp
> >>  endif
> >>  
> >> -mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET)
> >> +define do_links
> >> +  touch $@
> > 
> > This should be moved to the last line of this macro.
> > 
> > If you agree on this, I can fix it up while committing.
> > 

What about this comment?

Wei.

> >> +  mkdir -p $(dir $@)include
> >> +  cd $(dir $@); \
> >> +  ln -sf $(dir $<)include/*.h include/; \
> >> +  ln -sf $(dir $<)*.[ch] .; \
> >> +  ln -sf $(dir $<)Makefile .
> >> +endef
> >> +
> > 
> > Wei.
> > 
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel