* do not skip manuals shared across architectures
@ 2011-12-26 11:48 Ingo Schwarze
2011-12-28 0:00 ` Kristaps Dzonsons
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Schwarze @ 2011-12-26 11:48 UTC (permalink / raw)
To: tech
You want this on bsd.lv, too?
Ingo
----- Forwarded message from Ingo Schwarze <schwarze@cvs.openbsd.org> -----
From: Ingo Schwarze <schwarze@cvs.openbsd.org>
Date: Mon, 26 Dec 2011 04:44:31 -0700 (MST)
To: source-changes@cvs.openbsd.org
Subject: CVS: cvs.openbsd.org: src
CVSROOT: /cvs
Module name: src
Changes by: schwarze@cvs.openbsd.org 2011/12/26 04:44:31
Modified files:
usr.bin/mandoc : mandocdb.c
Log message:
Do not skip manuals shared across architectures when building databases.
----- End forwarded message -----
Index: mandocdb.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.31
diff -u -p -r1.31 mandocdb.c
--- mandocdb.c 25 Dec 2011 19:57:20 -0000 1.31
+++ mandocdb.c 26 Dec 2011 11:42:28 -0000
@@ -603,8 +603,8 @@ index_merge(const struct of *of, struct
/*
* By default, skip a file if the manual section
- * and architecture given in the file disagree
- * with the directory where the file is located.
+ * given in the file disagrees with the directory
+ * where the file is located.
*/
skip = 0;
@@ -619,6 +619,21 @@ index_merge(const struct of *of, struct
skip = 1;
}
+ /*
+ * Manual page directories exist for each kernel
+ * architecture as returned by machine(1).
+ * However, many manuals only depend on the
+ * application architecture as returned by arch(1).
+ * For example, some (2/ARM) manuals are shared
+ * across the "armish" and "zaurus" kernel
+ * architectures.
+ * A few manuals are even shared across completely
+ * different architectures, for example fdformat(1)
+ * on amd64, i386, sparc, and sparc64.
+ * Thus, warn about architecture mismatches,
+ * but don't skip manuals for this reason.
+ */
+
assert(of->arch);
assert(march);
if (strcasecmp(march, of->arch)) {
@@ -627,7 +642,7 @@ index_merge(const struct of *of, struct
"architecture \"%s\" manual "
"in \"%s\" directory\n",
fn, march, of->arch);
- skip = 1;
+ march = of->arch;
}
/*
--
To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: do not skip manuals shared across architectures
2011-12-26 11:48 do not skip manuals shared across architectures Ingo Schwarze
@ 2011-12-28 0:00 ` Kristaps Dzonsons
2011-12-28 0:37 ` Ingo Schwarze
0 siblings, 1 reply; 3+ messages in thread
From: Kristaps Dzonsons @ 2011-12-28 0:00 UTC (permalink / raw)
To: tech
On 26/12/2011 13:48, Ingo Schwarze wrote:
> You want this on bsd.lv, too?
Ingo,
Yes, please commit. Can you also document these checks in mandocdb(8)
so people can know more or less what `-t' is checking for?
Thanks!
Kristaps
--
To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: do not skip manuals shared across architectures
2011-12-28 0:00 ` Kristaps Dzonsons
@ 2011-12-28 0:37 ` Ingo Schwarze
0 siblings, 0 replies; 3+ messages in thread
From: Ingo Schwarze @ 2011-12-28 0:37 UTC (permalink / raw)
To: tech
Hi Kristaps,
Kristaps Dzonsons wrote on Wed, Dec 28, 2011 at 02:00:19AM +0200:
> On 26/12/2011 13:48, Ingo Schwarze wrote:
>> You want this on bsd.lv, too?
> Yes, please commit.
Done, thanks.
> Can you also document these checks in mandocdb(8) so people can
> know more or less what `-t' is checking for?
In the long run, yes, i think that makes sense.
Right now, these checks are still too volatile.
I'm not looking forward to rewriting the docs
multiple times.
I think the right time will be after the first round of dealing
with fallout from the base builds has been completed - this commit
was just the first of this round, several more are required for
polishing - *and* after a careful comparison against espie@'s
OpenBSD::Makewhatis modules has been completed. At that point,
i hope for the tests to become more or less stable.
Yours,
Ingo
--
To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-28 0:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-26 11:48 do not skip manuals shared across architectures Ingo Schwarze
2011-12-28 0:00 ` Kristaps Dzonsons
2011-12-28 0:37 ` Ingo Schwarze
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).