Module Name: src
Committed By: martin
Date: Sat Sep 29 06:48:22 UTC 2018
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
Add defaults and documentation for USE_XZ_SETS - a new variable
controlling whether an architecture will use .tgz or tar.xz
sets.
To generate a diff of this commit:
cvs rdiff -u -r1.384 -r1.385 src/share/mk/bsd.README
cvs rdiff -u -r1.1075 -r1.1076 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.384 src/share/mk/bsd.README:1.385
--- src/share/mk/bsd.README:1.384 Sun Sep 16 13:14:12 2018
+++ src/share/mk/bsd.README Sat Sep 29 06:48:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.384 2018/09/16 13:14:12 christos Exp $
+# $NetBSD: bsd.README,v 1.385 2018/09/29 06:48:22 martin Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -582,6 +582,11 @@ USE_PIGZGZIP If "no", use the host "gzip
and use nbpigz to compress things.
Default: "no".
+USE_XZ_SETS If "no", use the host "gzip" program to compress sets.
+ Otherwise use xz to compress things.
+ Default: "yes" for architectures with "enough" memory to
+ decompress, "no" for older ones.
+
COPTS.lib<lib>
OBJCOPTS.lib<lib>
LDADD.lib<lib>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1075 src/share/mk/bsd.own.mk:1.1076
--- src/share/mk/bsd.own.mk:1.1075 Wed Sep 5 06:54:29 2018
+++ src/share/mk/bsd.own.mk Sat Sep 29 06:48:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1075 2018/09/05 06:54:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1076 2018/09/29 06:48:22 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -420,6 +420,7 @@ TOOL_NCDCS= ${TOOLDIR}/bin/${_TOOL_PREF
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
TOOL_PIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}pic
TOOL_PIGZ= ${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
+TOOL_XZ= ${TOOLDIR}/bin/xz
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
@@ -531,6 +532,7 @@ TOOL_NCDCS= ncdcs
TOOL_PAX= pax
TOOL_PIC= pic
TOOL_PIGZ= pigz
+TOOL_XZ= xz
TOOL_PKG_CREATE= pkg_create
TOOL_POWERPCMKBOOTIMAGE= powerpc-mkbootimage
TOOL_PWD_MKDB= pwd_mkdb
@@ -1357,6 +1359,11 @@ ${var}?= yes
${var}?= no
.endfor
+# Default to USE_XZ_SETS on some 64bit architectures where decompressor
+# memory will likely not be in short supply.
+# XXX incomplete feature, set to no everywhere
+USE_XZ_SETS?= no
+
#
# TOOL_GZIP and friends. These might refer to TOOL_PIGZ or to the host gzip.
#
