* mdocml: Do not skip manuals shared across architectures when building
@ 2011-12-28 0:32 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2011-12-28 0:32 UTC (permalink / raw)
To: source
Log Message:
-----------
Do not skip manuals shared across architectures when building databases.
Modified Files:
--------------
mdocml:
mandocdb.c
Revision Data
-------------
Index: mandocdb.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.41 -r1.42
--- mandocdb.c
+++ mandocdb.c
@@ -615,8 +615,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;
@@ -631,6 +631,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)) {
@@ -639,7 +654,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 source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-28 0:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-28 0:32 mdocml: Do not skip manuals shared across architectures when building 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).