[src/trunk]: src/share/mk Explicitly document the incompatibility between USE...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d3c0eabfb944
branches:  trunk
changeset: 994608:d3c0eabfb944
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Nov 15 09:23:50 2018 +0000

description:
Explicitly document the incompatibility between USE_PIGZGZIP
and USE_XZ_SETS. Disable the latter if the former is enabled.

diffstat:

 share/mk/bsd.README |  5 ++++-
 share/mk/bsd.own.mk |  9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 1615c8766d80 -r d3c0eabfb944 share/mk/bsd.README
--- a/share/mk/bsd.README       Thu Nov 15 07:20:31 2018 +0000
+++ b/share/mk/bsd.README       Thu Nov 15 09:23:50 2018 +0000
@@ -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 @@
                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>
diff -r 1615c8766d80 -r d3c0eabfb944 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Nov 15 07:20:31 2018 +0000
+++ b/share/mk/bsd.own.mk       Thu Nov 15 09:23:50 2018 +0000
@@ -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 @@
 
 # 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