Remove WITHOUT_BZIP2, WITHOUT_BZIP2_SUPPORT

WITHOUT_BZIP2_SUPPORT only affects a single binary, gzip(1); it doesn't
remove bzip2 support from other bits (e.g., libarchive) and there are
no similar options for gzip, xz or zstd.

WITHOUT_BZIP2 has not done anything at all since it was first added
in 2007.

MFC after:	never
Discussed on:	arch@
Reviewed by:	imp, des, adrian, delphij, emaste
Differential Revision:	https://reviews.freebsd.org/D56148
Sponsored by:		https://www.patreon.com/bsdivy
This commit is contained in:
Lexi Winter
2026-04-03 14:50:09 +01:00
parent b13d7062b3
commit ab9257599a
5 changed files with 2 additions and 30 deletions
+1 -16
View File
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.Dd April 2, 2026
.Dd April 3, 2026
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -315,21 +315,6 @@ and related programs.
Do not build or install
.Xr bsnmpd 1
and related libraries and data files.
.It Va WITHOUT_BZIP2
Do not build contributed bzip2 software as a part of the base system.
.Bf -symbolic
The option has no effect yet.
.Ef
When set, these options are also in effect:
.Pp
.Bl -inset -compact
.It Va WITHOUT_BZIP2_SUPPORT
(unless
.Va WITH_BZIP2_SUPPORT
is set explicitly)
.El
.It Va WITHOUT_BZIP2_SUPPORT
Build some programs without optional bzip2 support.
.It Va WITHOUT_CALENDAR
Do not build
.Xr calendar 1 .
-2
View File
@@ -73,7 +73,6 @@ __DEFAULT_YES_OPTIONS = \
BOOTPD \
BSDINSTALL \
BSNMP \
BZIP2 \
CALENDAR \
CAROOT \
CCD \
@@ -246,7 +245,6 @@ __LIBC_MALLOC_DEFAULT= jemalloc
.for var in \
BLACKLIST \
BLOCKLIST \
BZIP2 \
INET \
INET6 \
KERBEROS \
-4
View File
@@ -1,4 +0,0 @@
Do not build contributed bzip2 software as a part of the base system.
.Bf -symbolic
The option has no effect yet.
.Ef
@@ -1 +0,0 @@
Build some programs without optional bzip2 support.
+1 -7
View File
@@ -5,13 +5,7 @@
PROG= gzip
MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
LIBADD= z lzma zstd
.if ${MK_BZIP2_SUPPORT} != "no"
LIBADD+= bz2
.else
CFLAGS+= -DNO_BZIP2_SUPPORT
.endif
LIBADD= bz2 lzma z zstd
CFLAGS+= -I${SRCTOP}/sys/contrib/zstd/lib