public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: fix info+man page builds Date: Thu, 27 Jan 2022 02:46:24 +0000 (GMT) [thread overview] Message-ID: <20220127024624.E87123858D20@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=866de704f3b5b8f8d297b1adf5e4c5fc62b93c16 commit 866de704f3b5b8f8d297b1adf5e4c5fc62b93c16 Author: Mike Frysinger <vapier@gentoo.org> Date: Wed Jan 26 21:41:47 2022 -0500 newlib: fix info+man page builds The work to merge libc/machine/ up a dir lost the stub doc targets. So when libc/ recursed into machine/, it would stop going deeper as the doc rules were empty. But now that libc/ goes directly into the libc/machine/$arch/ and those have never had doc stubs, the build fails. Add a quick hack to the top dir to ignore all machine/$arch/ dirs when generating docs. A follow up series will delete all of this code as it merges all the doc rules into the top newlib dir. Diff: --- newlib/libc/Makefile.am | 4 ++-- newlib/libc/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/newlib/libc/Makefile.am b/newlib/libc/Makefile.am index 7807291ba..5151e00da 100644 --- a/newlib/libc/Makefile.am +++ b/newlib/libc/Makefile.am @@ -199,7 +199,7 @@ stmp-targetdep: force rm -f tmp-targetdep.texi targetdoc=`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ - if test "$$d" != "."; then \ + if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \ fi; \ done @@ -218,7 +218,7 @@ libc_TEXINFOS = sigset.texi posix.texi stdio64.texi iconvset.texi \ docbook-recursive: force for d in $(SUBDIRS); do \ - if test "$$d" != "."; then \ + if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) docbook) || exit 1; \ fi; \ done diff --git a/newlib/libc/Makefile.in b/newlib/libc/Makefile.in index 7e29c18e1..27d014496 100644 --- a/newlib/libc/Makefile.in +++ b/newlib/libc/Makefile.in @@ -1185,7 +1185,7 @@ stmp-targetdep: force rm -f tmp-targetdep.texi targetdoc=`pwd`/tmp-targetdep.texi; \ for d in $(SUBDIRS); do \ - if test "$$d" != "."; then \ + if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) TARGETDOC=$${targetdoc} doc) || exit 1; \ fi; \ done @@ -1199,7 +1199,7 @@ $(SUBDEFS): stmp-targetdep ; @true docbook-recursive: force for d in $(SUBDIRS); do \ - if test "$$d" != "."; then \ + if test "$$d" != "." && test "$$d" != "$(LIBC_MACHINE_DIR)"; then \ (cd $$d && $(MAKE) docbook) || exit 1; \ fi; \ done
reply other threads:[~2022-01-27 2:46 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220127024624.E87123858D20@sourceware.org \ --to=vapier@sourceware.org \ --cc=newlib-cvs@sourceware.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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).