Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk - Fix groff reproducibility:
details: https://anonhg.NetBSD.org/src/rev/1fc5d7d132c8
branches: trunk
changeset: 320085:1fc5d7d132c8
user: christos <christos%NetBSD.org@localhost>
date: Fri Jun 22 17:31:24 2018 +0000
description:
- Fix groff reproducibility:
- specify mdoc and font paths
- clear encoding
- specify pagesize on the command line
XXX: pullup-8
diffstat:
share/mk/bsd.own.mk | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diffs (62 lines):
diff -r ac56ed8d5634 -r 1fc5d7d132c8 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Fri Jun 22 17:28:27 2018 +0000
+++ b/share/mk/bsd.own.mk Fri Jun 22 17:31:24 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1065 2018/06/16 19:05:17 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1066 2018/06/22 17:31:24 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -390,7 +390,14 @@
# grep exists in src/tools, but is not hooked up into the build.
#TOOL_GREP= ${TOOLDIR}/bin/${_TOOL_PREFIX}grep
TOOL_GREP= grep
-TOOL_GROFF= PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff
+GROFF_SHARE_PATH= ${TOOLDIR}/share/groff
+TOOL_GROFF_ENV= \
+ GROFF_ENCODING= \
+ GROFF_BIN_PATH=${TOOLDIR}/lib/groff \
+ GROFF_FONT_PATH=${GROFF_SHARE_PATH}/site-font:${GROFF_SHARE_PATH}/font \
+ GROFF_TMAC_PATH=${GROFF_SHARE_PATH}/site-tmac:${GROFF_SHARE_PATH}/tmac
+TOOL_GROFF= ${TOOL_GROFF_ENV} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff ${GROFF_FLAGS}
+
TOOL_HEXDUMP= ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
TOOL_HP300MKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot
TOOL_HPPAMKBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot
@@ -432,12 +439,12 @@
TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
TOOL_PWD_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
TOOL_REFER= ${TOOLDIR}/bin/${_TOOL_PREFIX}refer
-TOOL_ROFF_ASCII= PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
+TOOL_ROFF_ASCII= ${TOOL_GROFF_ENV} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
TOOL_ROFF_DOCASCII= ${TOOL_GROFF} -Tascii
TOOL_ROFF_DOCHTML= ${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI= ${TOOL_GROFF} -Tdvi
+TOOL_ROFF_DVI= ${TOOL_GROFF} -Tdvi ${ROFF_PAGESIZE}
TOOL_ROFF_HTML= ${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS= ${TOOL_GROFF} -Tps
+TOOL_ROFF_PS= ${TOOL_GROFF} -Tps ${ROFF_PAGESIZE}
TOOL_ROFF_RAW= ${TOOL_GROFF} -Z
TOOL_RPCGEN= RPCGEN_CPP=${CPP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}rpcgen
TOOL_SED= ${TOOLDIR}/bin/${_TOOL_PREFIX}sed
@@ -546,9 +553,9 @@
TOOL_ROFF_ASCII= nroff
TOOL_ROFF_DOCASCII= ${TOOL_GROFF} -Tascii
TOOL_ROFF_DOCHTML= ${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI= ${TOOL_GROFF} -Tdvi
+TOOL_ROFF_DVI= ${TOOL_GROFF} -Tdvi ${ROFF_PAGESIZE}
TOOL_ROFF_HTML= ${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS= ${TOOL_GROFF} -Tps
+TOOL_ROFF_PS= ${TOOL_GROFF} -Tps ${ROFF_PAGESIZE}
TOOL_ROFF_RAW= ${TOOL_GROFF} -Z
TOOL_RPCGEN= rpcgen
TOOL_SED= sed
@@ -1128,6 +1135,8 @@
.if defined(MKREPRO)
MKARZERO ?= ${MKREPRO}
+GROFF_FLAGS ?= -dpaper=letter
+ROFF_PAGESIZE ?= -P-pletter
.endif
# Only install the general firmware on some systems
Home |
Main Index |
Thread Index |
Old Index