diff options
| author | Warner Losh <imp@FreeBSD.org> | 2022-07-08 16:29:25 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-01-24 21:49:22 +0000 |
| commit | c75e9e027397d06acf71b923965b6094ea9be674 (patch) | |
| tree | d59ba2c691db33e9c6e11491791f7356262de1f1 | |
| parent | 09a31487c1bdcb5dc8780fdd7e78540d686a3854 (diff) | |
| download | src-c75e9e027397d06acf71b923965b6094ea9be674.tar.gz src-c75e9e027397d06acf71b923965b6094ea9be674.zip | |
stand: constrain zlib/gzip CFLAGS better
Define ZLIB_CFLAGS and use it only for the sources that are in ZLIB or
that include it.
Sponsored by: Netflix
(cherry picked from commit 84bf2bbbecc369cea6095bed7a738674b27f8d13)
| -rw-r--r-- | stand/libsa/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index f319645a8072..682fdd9badce 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -96,9 +96,11 @@ SRCS+=${i} # decompression functionality from zlib .PATH: ${SRCTOP}/sys/contrib/zlib -CFLAGS+=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib -SRCS+= adler32.c crc32.c -SRCS+= infback.c inffast.c inflate.c inftrees.c zutil.c +ZLIB_CFLAGS=-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib +.for i in adler32.c crc32.c infback.c inffast.c inflate.c inftrees.c zutil.c +CFLAGS.${i}+=${ZLIB_CFLAGS} +SRCS+= ${i} +.endfor # lz4 decompression functionality .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 @@ -182,6 +184,8 @@ CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL CFLAGS.dosfs.c+= -I${LDRSRC} CFLAGS.tftp.c+= -I${LDRSRC} CFLAGS.ufs.c+= -I${LDRSRC} +CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} +CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS # explicit_bzero and calculate_crc32c |