From nobody Wed Jul 20 17:24:06 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lp2cV6hKNz4WVJD; Wed, 20 Jul 2022 17:24:10 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lp2cT3kNXz45ft; Wed, 20 Jul 2022 17:24:09 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.1/8.16.1) with ESMTP id 26KHO6JW058161; Wed, 20 Jul 2022 20:24:06 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.1/8.16.1/Submit) id 26KHO6e4058160; Wed, 20 Jul 2022 20:24:06 +0300 (MSK) (envelope-from dchagin) Date: Wed, 20 Jul 2022 20:24:06 +0300 From: Dmitry Chagin To: Warner Losh Cc: 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: References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4Lp2cT3kNXz45ft X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of dchagin@heemeyer.club has no SPF policy when checking 195.93.173.158) smtp.mailfrom=dchagin@heemeyer.club X-Spamd-Result: default: False [-2.10 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[heemeyer.club]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEFALL_USER(0.00)[dchagin]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record] X-ThisMailContainsUnwantedMimeParts: N On Fri, Jul 08, 2022 at 05:50:05PM +0000, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=84bf2bbbecc369cea6095bed7a738674b27f8d13 > > commit 84bf2bbbecc369cea6095bed7a738674b27f8d13 > Author: Warner Losh > AuthorDate: 2022-07-08 16:29:25 +0000 > Commit: Warner Losh > CommitDate: 2022-07-08 17:47:37 +0000 > > 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 > --- > stand/libsa/Makefile | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > 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+=${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 > @@ -168,9 +170,8 @@ SRCS+= time.c > .PATH: ${SRCTOP}/sys/ufs/ffs > SRCS+=ffs_subr.c ffs_tables.c > > -CFLAGS.dosfs.c+= -I${LDRSRC} > -CFLAGS.tftp.c+= -I${LDRSRC} > -CFLAGS.ufs.c+= -I${LDRSRC} ^^^^^^^^^^^^ is this correct? at least it breaks builds with WITHOUT_LOADER_ZFS and WITHOUT_BOOT probably, see PR/260083 > +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