Module Name:    src
Committed By:   mrg
Date:           Sun Jun 20 06:54:24 UTC 2010

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

Log Message:
- note that if MKINET6 is "no", MK11 must also be "no".  we don't support
  building X11 without inet6 support.  the support to maintain patches to
  generated files and other files is too great.  PR#42856
- add TOOL_PIGZ, which defaults to the (not yet default) built tools/pigz.


To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 src/share/mk/bsd.README
cvs rdiff -u -r1.631 -r1.632 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.272 src/share/mk/bsd.README:1.273
--- src/share/mk/bsd.README:1.272	Sat Jun 19 03:50:30 2010
+++ src/share/mk/bsd.README	Sun Jun 20 06:54:24 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.272 2010/06/19 03:50:30 mrg Exp $
+#	$NetBSD: bsd.README,v 1.273 2010/06/20 06:54:24 mrg Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -205,7 +205,8 @@
 		Default: no
 
 MKINET6		If "no", disables building of INET6 (IPv6) infrastructure
-		(libraries and support programs).
+		(libraries and support programs).  This option must not be
+		set to "no" if MKX11 is not "no".
 		Default: yes
 
 MKINFO		If "no", don't build or install Info documentation from
@@ -743,6 +744,8 @@
 
 TOOL_PIC		Compile pictures for groff.  [pic]
 
+TOOL_PIGZ		Parallel compressor.  [pigz]
+
 TOOL_POWERPCMKBOOTIMAGE	Make bootable image for powerpc.  [powerpc-mkbootimage]
 
 TOOL_PWD_MKDB		Generate the password databases.  [pwd_mkdb]

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.631 src/share/mk/bsd.own.mk:1.632
--- src/share/mk/bsd.own.mk:1.631	Sat Jun 19 03:50:30 2010
+++ src/share/mk/bsd.own.mk	Sun Jun 20 06:54:23 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.631 2010/06/19 03:50:30 mrg Exp $
+#	$NetBSD: bsd.own.mk,v 1.632 2010/06/20 06:54:23 mrg Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -275,6 +275,7 @@
 TOOL_NBPERF=		${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf
 TOOL_PAX=		${TOOLDIR}/bin/${_TOOL_PREFIX}pax
 TOOL_PIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}pic
+TOOL_PIGZ=		${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
 TOOL_PKG_CREATE=	${TOOLDIR}/bin/${_TOOL_PREFIX}pkg_create
 TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
 TOOL_PWD_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
@@ -351,6 +352,7 @@
 TOOL_NBPERF=		nbperf
 TOOL_PAX=		pax
 TOOL_PIC=		pic
+TOOL_PIGZ=		pigz
 TOOL_PKG_CREATE=	pkg_create
 TOOL_POWERPCMKBOOTIMAGE=	powerpc-mkbootimage
 TOOL_PWD_MKDB=		pwd_mkdb

Reply via email to