Wed Apr 24 05:20:35 2024 UTC (16d)
USE_XZ_SETS is no longer needed for sparc64 to fit on a standard CD-ROM


(nia)
diff -r1.1368 -r1.1369 src/share/mk/bsd.own.mk
cvs diff -r1.1368 -r1.1369 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2024/04/23 03:25:39 1.1368
+++ src/share/mk/bsd.own.mk 2024/04/24 05:20:35 1.1369
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.1368 2024/04/23 03:25:39 maya Exp $ 1# $NetBSD: bsd.own.mk,v 1.1369 2024/04/24 05:20:35 nia Exp $
2 2
3# This needs to be before bsd.init.mk 3# This needs to be before bsd.init.mk
4.if defined(BSD_MK_COMPAT_FILE) 4.if defined(BSD_MK_COMPAT_FILE)
5.include <${BSD_MK_COMPAT_FILE}> 5.include <${BSD_MK_COMPAT_FILE}>
6.endif 6.endif
7 7
8.if !defined(_BSD_OWN_MK_) 8.if !defined(_BSD_OWN_MK_)
9_BSD_OWN_MK_=1 9_BSD_OWN_MK_=1
10 10
11MAKECONF?= /etc/mk.conf 11MAKECONF?= /etc/mk.conf
12.-include "${MAKECONF}" 12.-include "${MAKECONF}"
13 13
14# 14#
@@ -1597,27 +1597,26 @@ ${var}?= yes @@ -1597,27 +1597,26 @@ ${var}?= yes
1597# USE_* options which default to "no". 1597# USE_* options which default to "no".
1598# 1598#
1599# For now, disable pigz as compressor by default 1599# For now, disable pigz as compressor by default
1600.for var in USE_PIGZGZIP 1600.for var in USE_PIGZGZIP
1601${var}?= no 1601${var}?= no
1602.endfor 1602.endfor
1603 1603
1604# Default to USE_XZ_SETS on some 64bit architectures where decompressor 1604# Default to USE_XZ_SETS on some 64bit architectures where decompressor
1605# memory will likely not be in short supply. 1605# memory will likely not be in short supply.
1606# Since pigz can not create .xz format files currently, disable .xz 1606# Since pigz can not create .xz format files currently, disable .xz
1607# format if USE_PIGZGZIP is enabled. 1607# format if USE_PIGZGZIP is enabled.
1608.if ${USE_PIGZGZIP} == "no" && \ 1608.if ${USE_PIGZGZIP} == "no" && \
1609 (${MACHINE} == "amd64" || \ 1609 (${MACHINE} == "amd64" || \
1610 ${MACHINE} == "sparc64" || \ 
1611 ${MACHINE_ARCH:Maarch64*}) 1610 ${MACHINE_ARCH:Maarch64*})
1612USE_XZ_SETS?= yes 1611USE_XZ_SETS?= yes
1613.else 1612.else
1614USE_XZ_SETS?= no 1613USE_XZ_SETS?= no
1615.endif 1614.endif
1616 1615
1617# 1616#
1618# TOOL_GZIP and friends. These might refer to TOOL_PIGZ or to the host gzip. 1617# TOOL_GZIP and friends. These might refer to TOOL_PIGZ or to the host gzip.
1619# 1618#
1620.if ${USE_PIGZGZIP} != "no" 1619.if ${USE_PIGZGZIP} != "no"
1621TOOL_GZIP= ${TOOL_PIGZ} 1620TOOL_GZIP= ${TOOL_PIGZ}
1622GZIP_N_FLAG?= -nT 1621GZIP_N_FLAG?= -nT
1623.else 1622.else