Date: Fri, 03 Apr 2026 13:51:43 +0000 From: Lexi Winter <ivy@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ab9257599a55 - main - Remove WITHOUT_BZIP2, WITHOUT_BZIP2_SUPPORT Message-ID: <69cfc5ef.3800c.eae8c0f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ab9257599a551cf4be8738ec52205998f4e7dd81 commit ab9257599a551cf4be8738ec52205998f4e7dd81 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2026-04-03 13:50:09 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2026-04-03 13:50:09 +0000 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 --- share/man/man5/src.conf.5 | 17 +---------------- share/mk/src.opts.mk | 2 -- tools/build/options/WITHOUT_BZIP2 | 4 ---- tools/build/options/WITHOUT_BZIP2_SUPPORT | 1 - usr.bin/gzip/Makefile | 8 +------- 5 files changed, 2 insertions(+), 30 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9862d5aa8154..a94c5d6177b4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -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 . diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5e59f476a743..5c3e3bb31a7f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 \ diff --git a/tools/build/options/WITHOUT_BZIP2 b/tools/build/options/WITHOUT_BZIP2 deleted file mode 100644 index 0ec4f7638a44..000000000000 --- a/tools/build/options/WITHOUT_BZIP2 +++ /dev/null @@ -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 diff --git a/tools/build/options/WITHOUT_BZIP2_SUPPORT b/tools/build/options/WITHOUT_BZIP2_SUPPORT deleted file mode 100644 index 0cc8c81fadff..000000000000 --- a/tools/build/options/WITHOUT_BZIP2_SUPPORT +++ /dev/null @@ -1 +0,0 @@ -Build some programs without optional bzip2 support. diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 33fbdb85d78c..fae01959596c 100644 --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -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/libhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cfc5ef.3800c.eae8c0f>