git: 09a31487c1bd - stable/13 - stand: Confine BZIP defines to bzip files
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 24 Jan 2023 22:10:42 UTC
The branch stable/13 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=09a31487c1bdcb5dc8780fdd7e78540d686a3854
commit 09a31487c1bdcb5dc8780fdd7e78540d686a3854
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-08 16:19:39 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-01-24 21:49:22 +0000
stand: Confine BZIP defines to bzip files
Sponsored by: Netflix
(cherry picked from commit 59a4cfe03cf7a916a3d855f63fa8b6955f1d4136)
---
stand/libsa/Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index 621747a85d0f..f319645a8072 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
@@ -181,7 +182,7 @@ CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL
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