Module Name:    src
Committed By:   apb
Date:           Tue Aug  5 15:25:20 UTC 2014

Modified Files:
        src/share/mk: bsd.README bsd.own.mk

Log Message:
Provide and document GZIP_N_FLAG and TOOL_GZIP_N.
These may be used to pass "-nT" instead of just "-n"
when the gzip program is actually pigz.


To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 src/share/mk/bsd.README
cvs rdiff -u -r1.824 -r1.825 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.334 src/share/mk/bsd.README:1.335
--- src/share/mk/bsd.README:1.334	Sun Jul  6 18:22:03 2014
+++ src/share/mk/bsd.README	Tue Aug  5 15:25:20 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.334 2014/07/06 18:22:03 dholland Exp $
+#	$NetBSD: bsd.README,v 1.335 2014/08/05 15:25:20 apb Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -621,6 +621,10 @@ DOCOWN		Documentation owner.  [root]
 
 DOCMODE		Documentation mode.  [${NONBINMODE}]
 
+GZIP_N_FLAG	Flags to pass to TOOL_GZIP to prevent it from inserting
+		file names or timestamps in the compressed output.
+		[-n, or -nT when TOOL_GZIP is really TOOL_PIGZ]
+
 NLSDIR		Base path for Native Language Support files installation.
 		[/usr/share/nls]
 
@@ -800,6 +804,11 @@ TOOL_GROFF		Front end for groff document
 
 TOOL_GZIP		Compression/decompression tool.  [gzip]
 
+TOOL_GZIP_N		Same as TOOL_GZIP, plus a command line option to
+			prevent it from inserting file names or timestamps
+			into the compressed output.
+			[${TOOL_GZIP} ${GZIP_N_FLAG}]
+
 TOOL_HEXDUMP		Ascii, decimal, hexadecimal, octal dump.  [hexdump]
 
 TOOL_HP300MKBOOT	Make bootable image for hp300.  [hp300-mkboot]

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.824 src/share/mk/bsd.own.mk:1.825
--- src/share/mk/bsd.own.mk:1.824	Thu Jul 24 20:29:19 2014
+++ src/share/mk/bsd.own.mk	Tue Aug  5 15:25:20 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.824 2014/07/24 20:29:19 plunky Exp $
+#	$NetBSD: bsd.own.mk,v 1.825 2014/08/05 15:25:20 apb Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1174,11 +1174,17 @@ ${var}?= yes
 ${var}?= no
 .endfor
 
+#
+# TOOL_GZIP and friends.  These might refer to TOOL_PIGS or to the host gzip.
+#
 .if ${USE_PIGZGZIP} != "no"
 TOOL_GZIP=		${TOOL_PIGZ}
+GZIP_N_FLAG?=		-nT
 .else
 TOOL_GZIP=		gzip
+GZIP_N_FLAG?=		-n
 .endif
+TOOL_GZIP_N=		${TOOL_GZIP} ${GZIP_N_FLAG}
 
 #
 # Where X11 sources are and where it is installed to.

Reply via email to