Module Name: src
Committed By: martin
Date: Thu Nov 15 09:23:50 UTC 2018
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
Explicitly document the incompatibility between USE_PIGZGZIP
and USE_XZ_SETS. Disable the latter if the former is enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.385 -r1.386 src/share/mk/bsd.README
cvs rdiff -u -r1.1082 -r1.1083 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.385 src/share/mk/bsd.README:1.386
--- src/share/mk/bsd.README:1.385 Sat Sep 29 06:48:22 2018
+++ src/share/mk/bsd.README Thu Nov 15 09:23:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.385 2018/09/29 06:48:22 martin Exp $
+# $NetBSD: bsd.README,v 1.386 2018/11/15 09:23:50 martin Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -586,6 +586,9 @@ USE_XZ_SETS If "no", use the host "gzip"
Otherwise use xz to compress things.
Default: "yes" for architectures with "enough" memory to
decompress, "no" for older ones.
+ This is currently incompatible with USE_PIGZGZIP, setting
+ USE_PIGZGZIP=yes sets USE_XZ_SETS=no by default for all
+ architectures.
COPTS.lib<lib>
OBJCOPTS.lib<lib>
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1082 src/share/mk/bsd.own.mk:1.1083
--- src/share/mk/bsd.own.mk:1.1082 Sun Nov 11 18:02:23 2018
+++ src/share/mk/bsd.own.mk Thu Nov 15 09:23:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1082 2018/11/11 18:02:23 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1083 2018/11/15 09:23:50 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1363,7 +1363,12 @@ ${var}?= no
# Default to USE_XZ_SETS on some 64bit architectures where decompressor
# memory will likely not be in short supply.
-.if ${MACHINE} == "amd64" || ${MACHINE} == "sparc64" || ${MACHINE} == "alpha"
+# Since pigz can not create .xz format files currently, disable .xz
+# format if USE_PIGZGZIP is enabled.
+.if ${USE_PIGZGZIP} == "no" && \
+ (${MACHINE} == "amd64" || \
+ ${MACHINE} == "sparc64" || \
+ ${MACHINE} == "alpha")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
