From nobody Wed Jul 20 17:44:22 2022 X-Original-To: dev-commits-src-main@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 4Lp33w5035z4WXSc for ; Wed, 20 Jul 2022 17:44:28 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv50p00im-ztdg10021101.me.com (pv50p00im-ztdg10021101.me.com [17.58.6.44]) (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 4Lp33w4PSCz47xm for ; Wed, 20 Jul 2022 17:44:28 +0000 (UTC) (envelope-from tsoome@me.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=me.com; s=1a1hai; t=1658339067; bh=iBHSXsxXxF0mNx7uxezTYZ3DQs7DwGyUyv4xuuVSQl0=; h=Content-Type:Mime-Version:Subject:From:Date:Message-Id:To; b=bvmezH/A20SKGCA7MfX3ANpcsabXAsusrvxZqT0YLR/JIbRve2D+kUh4MQt7TW/01 a+Saj24e1S6O+0/53QebDjTrnk+RqqD61PzJ84iNnAqKioJpBoVYMxrKIN/PjFlzM7 Yf+AGp/7sER/7eJ9IgC3fQp9apcWuuCejve1saGINS8Fz/4mBrjDxJRfZoawss/W4E amBYq3Yge0Ck5R1wbWKyNbQB+N+Zj/tRhZwo6A4W7kRwDBhfKaHzJcW5tW8sSTiM4G qH7j/bFPI3ImYzdqf82SVhKHXQLg71X/mf4un4lxJDeley3+wQYEw23VODWu5SQVhK b9HilBtYrWbnw== Received: from smtpclient.apple (pv50p00im-dlb-asmtp-mailmevip.me.com [17.56.9.10]) by pv50p00im-ztdg10021101.me.com (Postfix) with ESMTPSA id 55405D005B0; Wed, 20 Jul 2022 17:44:25 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.100.31\)) Subject: Re: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better From: Toomas Soome In-Reply-To: Date: Wed, 20 Jul 2022 20:44:22 +0300 Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <244CD526-C7D0-4D42-9DAB-6EA690DFD3A7@me.com> References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> To: Dmitry Chagin X-Mailer: Apple Mail (2.3696.100.31) X-Proofpoint-ORIG-GUID: A__xj-4iS9r4RCnXsfT6kvCZxwPQRDtd X-Proofpoint-GUID: A__xj-4iS9r4RCnXsfT6kvCZxwPQRDtd X-Proofpoint-Virus-Version: =?UTF-8?Q?vendor=3Dfsecure_engine=3D1.1.170-22c6f66c430a71ce266a39bfe25bc?= =?UTF-8?Q?2903e8d5c8f:6.0.517,18.0.883,17.11.64.514.0000000_definitions?= =?UTF-8?Q?=3D2022-06-21=5F08:2022-06-21=5F01,2022-06-21=5F08,2022-02-23?= =?UTF-8?Q?=5F01_signatures=3D0?= X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 mlxscore=0 clxscore=1011 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxlogscore=796 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2207200072 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Rspamd-Queue-Id: 4Lp33w4PSCz47xm X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N > On 20. Jul 2022, at 20:24, Dmitry Chagin = 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 >> AuthorDate: 2022-07-08 16:29:25 +0000 >> Commit: Warner Losh >> 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