Date: Fri, 8 Jul 2022 17:50:04 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 59a4cfe03cf7 - main - stand: Confine BZIP defines to bzip files Message-ID: <202207081750.268Ho40Y066612@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59a4cfe03cf7a916a3d855f63fa8b6955f1d4136 commit 59a4cfe03cf7a916a3d855f63fa8b6955f1d4136 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-07-08 16:19:39 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2022-07-08 17:47:37 +0000 stand: Confine BZIP defines to bzip files Sponsored by: Netflix --- stand/libsa/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 6f2eaf3d959e..b5d800c26295 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -89,9 +89,10 @@ SRCS+= _setjmp.S # NOTE: to actually test this functionality after libbz2 upgrade compile # loader(8) with LOADER_BZIP2_SUPPORT defined .PATH: ${SRCTOP}/contrib/bzip2 -CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS - -SRCS+=bzlib.c crctable.c decompress.c huffman.c randtable.c +.for i in bzlib.c crctable.c decompress.c huffman.c randtable.c +CFLAGS.${i}+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS +SRCS+=${i} +.endfor # decompression functionality from zlib .PATH: ${SRCTOP}/sys/contrib/zlib @@ -170,7 +171,7 @@ SRCS+=ffs_subr.c ffs_tables.c CFLAGS.dosfs.c+= -I${LDRSRC} CFLAGS.tftp.c+= -I${LDRSRC} CFLAGS.ufs.c+= -I${LDRSRC} -CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 +CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS # explicit_bzero and calculate_crc32c .PATH: ${SYSDIR}/libkern
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207081750.268Ho40Y066612>