From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from scc-mailout.scc.kit.edu (scc-mailout.scc.kit.edu [129.13.185.202]) by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id pBQBmTTX003642 for ; Mon, 26 Dec 2011 06:48:30 -0500 (EST) Received: from hekate.usta.de (asta-nat.asta.uni-karlsruhe.de [172.22.63.82]) by scc-mailout-02.scc.kit.edu with esmtp (Exim 4.72 #1) id 1Rf92Z-00076Z-Mk; Mon, 26 Dec 2011 12:48:27 +0100 Received: from donnerwolke.usta.de ([172.24.96.3]) by hekate.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1Rf92Z-000609-Ms for tech@mdocml.bsd.lv; Mon, 26 Dec 2011 12:48:27 +0100 Received: from iris.usta.de ([172.24.96.5] helo=usta.de) by donnerwolke.usta.de with esmtp (Exim 4.72) (envelope-from ) id 1Rf92Z-0003x0-Ll for tech@mdocml.bsd.lv; Mon, 26 Dec 2011 12:48:27 +0100 Received: from schwarze by usta.de with local (Exim 4.72) (envelope-from ) id 1Rf92Z-0007W2-Dg for tech@mdocml.bsd.lv; Mon, 26 Dec 2011 12:48:27 +0100 Date: Mon, 26 Dec 2011 12:48:27 +0100 From: Ingo Schwarze To: tech@mdocml.bsd.lv Subject: do not skip manuals shared across architectures Message-ID: <20111226114827.GG11624@iris.usta.de> X-Mailinglist: mdocml-tech Reply-To: tech@mdocml.bsd.lv MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) You want this on bsd.lv, too? Ingo ----- Forwarded message from Ingo Schwarze ----- From: Ingo Schwarze 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