Date: Wed, 20 Jul 2022 20:44:22 +0300 From: Toomas Soome <tsoome@me.com> To: Dmitry Chagin <dchagin@heemeyer.club> Cc: Warner Losh <imp@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better Message-ID: <244CD526-C7D0-4D42-9DAB-6EA690DFD3A7@me.com> In-Reply-To: <Ytg6Noc7T8R6sLNy@heemeyer.club> References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> <Ytg6Noc7T8R6sLNy@heemeyer.club>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 20. Jul 2022, at 20:24, Dmitry Chagin <dchagin@heemeyer.club> = wrote: >=20 > On Fri, Jul 08, 2022 at 05:50:05PM +0000, Warner Losh wrote: >> The branch main has been updated by imp: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D84bf2bbbecc369cea6095bed7a738674= b27f8d13 >>=20 >> commit 84bf2bbbecc369cea6095bed7a738674b27f8d13 >> Author: Warner Losh <imp@FreeBSD.org> >> AuthorDate: 2022-07-08 16:29:25 +0000 >> Commit: Warner Losh <imp@FreeBSD.org> >> CommitDate: 2022-07-08 17:47:37 +0000 >>=20 >> stand: constrain zlib/gzip CFLAGS better >>=20 >> Define ZLIB_CFLAGS and use it only for the sources that are in = ZLIB or >> that include it. >>=20 >> Sponsored by: Netflix >> --- >> stand/libsa/Makefile | 13 +++++++------ >> 1 file changed, 7 insertions(+), 6 deletions(-) >>=20 >> diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile >> index b5d800c26295..09637bd5e9d4 100644 >> --- a/stand/libsa/Makefile >> +++ b/stand/libsa/Makefile >> @@ -96,9 +96,11 @@ SRCS+=3D${i} >>=20 >> # decompression functionality from zlib >> .PATH: ${SRCTOP}/sys/contrib/zlib >> -CFLAGS+=3D-DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib >> -SRCS+=3D adler32.c crc32.c >> -SRCS+=3D infback.c inffast.c inflate.c inftrees.c zutil.c >> +ZLIB_CFLAGS=3D-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}+=3D${ZLIB_CFLAGS} >> +SRCS+=3D ${i} >> +.endfor >>=20 >> # lz4 decompression functionality >> .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 >> @@ -168,9 +170,8 @@ SRCS+=3D time.c >> .PATH: ${SRCTOP}/sys/ufs/ffs >> SRCS+=3Dffs_subr.c ffs_tables.c >>=20 >> -CFLAGS.dosfs.c+=3D -I${LDRSRC} >> -CFLAGS.tftp.c+=3D -I${LDRSRC} >> -CFLAGS.ufs.c+=3D -I${LDRSRC} > ^^^^^^^^^^^^ is this correct? at least it breaks builds with > WITHOUT_LOADER_ZFS and WITHOUT_BOOT probably, see PR/260083 >=20 >=20 No, it is not correct. rgds, toomas >=20 >=20 >> +CFLAGS.gzipfs.c+=3D ${ZLIB_CFLAGS} >> +CFLAGS.pkgfs.c+=3D ${ZLIB_CFLAGS} >> CFLAGS.bzipfs.c+=3D -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO = -DBZ_NO_COMPRESS >>=20 >> # explicit_bzero and calculate_crc32c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?244CD526-C7D0-4D42-9DAB-6EA690DFD3A7>