From: "Alex Bennée" <alex.bennee@linaro.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PATCH] Makefile: Fix in-tree builds when Sphinx is available
Date: Thu, 19 Sep 2019 19:30:57 +0100 [thread overview]
Message-ID: <87lfukyw7y.fsf@linaro.org> (raw)
In-Reply-To: <CAFEAcA-eLvH2PfZjK_kxykQJT75y6CNzmZzxZg4SNZrekbvNHQ@mail.gmail.com>
Peter Maydell <peter.maydell@linaro.org> writes:
> On Thu, 19 Sep 2019 at 18:12, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>>
>> Peter Maydell <peter.maydell@linaro.org> writes:
>>
>> > In commit 27a296fce9821e we switched the qemu-ga manpage over to
>> > being built from Sphinx. The makefile rules for this were correct
>> > for an out-of-tree build, but break for in-tree builds if Sphinx is
>> > present and we're trying to build the documentation.
>> >
>> > Specifically, because Sphinx refuses to build output files into
>> > the same directory as its sources, for an in-tree build we tell
>> > it to build into a subdirectory docs/built, and set up a makefile
>> > variable MANUAL_BUILDDIR indicating where the docs are going.
>> > The makefile rule telling Make how to build qemu-ga.8 correctly
>> > used this variable, but the lines adding qemu-ga.8 to the list
>> > of DOCS to be built and the 'make install' rune did not. The
>> > effect was that for an in-tree build we told Make to build
>> > 'docs/interop/qemu-ga.8' but did not provide a specific rule for
>> > doing so, which caused Make to fall back to the old rules.make
>> > rule for building any "%.8" file. Make tried to invoke texi2pod
>> > with a bogus command line, resulting in the error:
>> >
>> > GEN docs/interop/qemu-ga.8
>> > No filename or title
>> > make: *** [rules.mak:394: docs/interop/qemu-ga.8]
>> >
>> > Fix this by using $(MANUAL_BUILDDIR) when constructing the
>> > list of DOCS files we want to build and also in the source
>> > file name we install for 'make install'.
>> >
>> > (Among other things, this broke the Shippable CI builds.)
>> >
>> > Reported-by: Eric Blake <eblake@redhat.com>
>> > Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>
>> heh I'd manually rebuilt the patch from your last email. I guess you can
>> apply this one directly though and I'll clean-up when I rebase for the PR.
>
> Yeah; I plan to apply it directly once it's accumulated some
> tested-by/reviewed-by tags.
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
>
> thanks
> -- PMM
--
Alex Bennée
next prev parent reply other threads:[~2019-09-19 18:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-19 15:59 [PATCH] Makefile: Fix in-tree builds when Sphinx is available Peter Maydell
2019-09-19 17:12 ` Alex Bennée
2019-09-19 17:14 ` Peter Maydell
2019-09-19 18:30 ` Alex Bennée [this message]
2019-09-20 12:27 ` Eric Blake
2019-09-20 12:56 ` Peter Maydell
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=87lfukyw7y.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).