From nobody Fri Jul 8 17:50:05 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 9BCE012AFFF1; Fri, 8 Jul 2022 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfglx2XHsz48mL; Fri, 8 Jul 2022 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIbOO+4NPEJ8hHNh4I2uZY93ATtI/vrt18WEvbMLGAc=; b=YcaUrE7i4Y2u/RqmzXbGoq7NsRGr15yhWI++EiPWiylZn/lvxx6z4qjONA1JrguazYNoaj iU8OzOhA7ymqG9CdrA2TON228PbcrRaHZZvPpqe/n0aU6RoW4hjMOpzB/3e8dserqEAb5T ZcqV6PmC/hudz1bY3VWKP1DLkIrA6TdpImesHm0bD5y+dWBlkxSzsTJGZ7N3JqDEA2ezTa MWRW2m74eZhxdzDSUsmsS6S48ptHpIPBTzgsEwerN86bkkGS2nyxklxztdo++FJkuWVOTm ZDqMXkklY+iwmPwCaJvCQZPjvn0EyZb7DaVbHz8KyQ0krLgLMTaU6nmKNXyu1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfglx1f4SzFkd; Fri, 8 Jul 2022 17:50:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268Ho5iQ066827; Fri, 8 Jul 2022 17:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Ho5kZ066824; Fri, 8 Jul 2022 17:50:05 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:50:05 GMT Message-Id: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 84bf2bbbecc3 - main - stand: constrain zlib/gzip CFLAGS better 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84bf2bbbecc369cea6095bed7a738674b27f8d13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qIbOO+4NPEJ8hHNh4I2uZY93ATtI/vrt18WEvbMLGAc=; b=cLFoFyHYiDE4xzXrfpGEJh4HpBtVMM/IgT0MvorOBC1kBRc3m2ZcMm8QHKFY9OP2pqnjWY LqOpua1+t1wHy30xEoia/q9NsO4ctzRtcHByE5SZWLemzQAQwBYMtVOMHQvSAGhzLfHdnq 0GHPEOyc/cgQihBevAaHgNFqj+HwPqYeu1nAEP26z5Lny24nTLm2AKxCs0YoKP0ZrHOi/l OLK9UovOd0xrKMe5+8l/S+vJBX/DmdjcQkIYXh9vvyI2dtaP9b32lQoN4UyCAuUwLY9MYJ rXqlGe91CWyFZZwiwfMLmPBdVW8AQaDfaEOEiuL3s9F/uky2rxwSe/pcVNEzKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302605; a=rsa-sha256; cv=none; b=s0JdLmsSv4rWM6yCXnvSw/hUJAUjieNpiE25NtpSAACTQGb1NLnINF0zK3zQfSyTG4U0NX TMD06a851nYVQ/EqbhDsJOW52QXIk1SyCoTFD5TLTbG5dzX9RJMxCJNk/Um3VrewMk/mkF wLNGATK5t0G5x2jr2Lu76bCXrFhQ2gKjInZPiIOMEFqX+r/FohwDdKkWz5bKo2lEYu/h4+ ncHaYLKq8xJpZZhf7Pj3dX57nF7gO1FDET5i7OTd1YWt0qmdefpvf97vb0qvfNloo9DIdS Ba3+/BUObApB+6UxuGWwAczJBzrwRvaytZRGHy+cTrawXIc0sqH3yXfROqurmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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} +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