From nobody Tue Jan 24 22:10:43 2023 X-Original-To: dev-commits-src-branches@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 4P1h4N31r9z3bf2D; Tue, 24 Jan 2023 22:10:44 +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 4P1h4N0qbNz4LMw; Tue, 24 Jan 2023 22:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598244; 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=4YIcSpqJuhqVGmnj90v8ub/jC8weqL/JA5Rq0LYVzSU=; b=XPGba6CoEfPpCCTvTBZxykBImZdKpFfgkIeMQ8hUvmhrMis3M9VcNzKIUbtHq4SVqhV0fE mDv3YH+FxGxpJuFSjd1jvz+q9VLuOO+7dOe9nOUje1b5E/uA8CoTxrm82j4NqXCwb1h25n LtBcgrciSVB2Qb65PxsNpzCTvKzwkWdS6S3TVrtSl8lekxPpdozu2gXe4qjZ7oBWPESj3q b4UdGm3f+RNwy8sbphlWhHxNRa64wIcqBiSXEspseg/WfHmD+xk3FkmbVgS+lzWsnRYNU9 DxODG8VpXXwbdCljGx40HOfldYM319Xf8HVA57YYaj/rRj7q/my2U1lV7f270g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598244; 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=4YIcSpqJuhqVGmnj90v8ub/jC8weqL/JA5Rq0LYVzSU=; b=m1SqsysB+/na3GEpSeCRYh7+rHX2B7LwdtIndsYRZ7ixoBO2YEU5wxXYM8BVFL8iYfYWgd zqgBPrQlPEJjYYF3b9lMi7zey2xdf3uo+IZgZBY1SP9tQfFIpuXMElnD0aJfMIkY+E6lm/ G7h4JJeFH/h58iinpEEYmgIabAH9heWcPuIjhsDuwGI9BVFA9AMQQlT11Fhdczyf3hM9ay wPDylRrmqGeozQfxraaBxuyFGq3PVlrKDBlFyIxhYRw8QvMtBC8ia5N42FFvc92/8JFOBb zjdaWhGCzjNfBk7NGDEKMOmxW/2yoxtBZRKJ0F9YazqYVGdvkhLHzlCT96Y4Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598244; a=rsa-sha256; cv=none; b=dK0IuXGycGnuEQYSxkrbuGoFzreQxr9BwGv/phM8Iukp2qzneMIp80nUCk1zEUfBrjYdR1 oeCCV0VauDLTnGG91Ye8zzj89Z0KSLhcjI1DumOFU2LeSrP3M7Hl4tDHy+s76QKMx92tBf 0cNMEhGPzNLFFbu67GMGSTIeb+LxQRBbNm09uDzB10r2xVp/J3U/thnBA8J/rynfJ0GHip EJSshSi4joPgO1vEvJGVPYsIIXZP3rNKj9xMSsBn5ey3xdsjXKZtPaj2wPMkCxDZ2oXCLY EP5ew2haMmI1UNxTPUn9UYw2xGRC6+zls/e50t0dFNhFpGJ4exKRb7DFh+Fggw== 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 4P1h4M6sbyzQFN; Tue, 24 Jan 2023 22:10:43 +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 30OMAhQ4080454; Tue, 24 Jan 2023 22:10:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAhPV080452; Tue, 24 Jan 2023 22:10:43 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:43 GMT Message-Id: <202301242210.30OMAhPV080452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c75e9e027397 - stable/13 - stand: constrain zlib/gzip CFLAGS better List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: c75e9e027397d06acf71b923965b6094ea9be674 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c75e9e027397d06acf71b923965b6094ea9be674 commit c75e9e027397d06acf71b923965b6094ea9be674 Author: Warner Losh AuthorDate: 2022-07-08 16:29:25 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:22 +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 (cherry picked from commit 84bf2bbbecc369cea6095bed7a738674b27f8d13) --- stand/libsa/Makefile | 10 +++++++--- 1 file 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