From nobody Wed Jul 20 17:57:55 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 4Lp3MV3kYHz4WYW0; Wed, 20 Jul 2022 17:57:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lp3MV30Fvz49xW; Wed, 20 Jul 2022 17:57:58 +0000 (UTC) (envelope-from tijl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658339878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A3jhP0aEzpBW+WK7UkOm7ycRBCLFVaCAzaW8Bc/8bec=; b=lK/i7rMVLh2uDIQnA0JY9LMKB+azkjvtLziAozAIKZlR2dd+1f71g4lxQYsHCyFotuIQKl H/4u8rGSXHgh402JfFDXi4TrsuFutabBB1dgJ0leF6ponIQePswQ2q1nnlpyoXsTN+C3Ue B1EVmuw/EXh5x/IuWeIDxJNypIEz4zDeWrc1KcJD1pdF6G/S0BLFgkCvBkaaItYCn00fO+ ot9uER4t8KTHJwUUt03bHbWnsR9wK0NQyoUecwqFvcxDoh+GBMd/gSDeKX9F4qviJREb1j byKqO4uQ2bx1a887o9WzJxi3wAk7nGhMa/5VkCC28kEn9IpwfyFJw+xG49YyHw== Received: from localhost (unknown [IPv6:2a02:a03f:894b:4700:d025:2a55:b2bf:7e75]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: tijl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Lp3MS5WQRz18cK; Wed, 20 Jul 2022 17:57:56 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Date: Wed, 20 Jul 2022 19:57:55 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Toomas Soome Cc: Dmitry Chagin , Warner Losh , 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: <20220720195755.366c9b43@FreeBSD.org> In-Reply-To: <244CD526-C7D0-4D42-9DAB-6EA690DFD3A7@me.com> References: <202207081750.268Ho5kZ066824@gitrepo.freebsd.org> <244CD526-C7D0-4D42-9DAB-6EA690DFD3A7@me.com> 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658339878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A3jhP0aEzpBW+WK7UkOm7ycRBCLFVaCAzaW8Bc/8bec=; b=vl/Xab8oZCrGEuf0XGKFzLQFaamBjQQgfL39zU4J0UhjDZfcQePo6CbQsIBFMT/jjaaQ+c S2b1eTyvFwr4rmCGblf8w0gdcVibzU86sYvTLMAED4qQvoFbo+wlHbc28Hw4FnsGDo4hzy mL2gKgoT+jYEXIZUj0qmJocH37fp/ZCV/Sz21SVnwBOgxJL23xyL1QdZaxQ9NggSDY3gAJ SdsncQkRdfmbwvIZeuGQHMth+4xA/sIdxisX1NLqKMR6chFTW5lyxAqMq7pbhDV8IChB/M e4LrM2pxHzHx59DfD6cbnFh+YzYxntdYXA7YrKKzY+WmKwZwQzfELyALLqR7ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658339878; a=rsa-sha256; cv=none; b=urzLVRzEAxS2os7Gs4f/4qNSL61qx3+IQyOrCg+CnKAGD37ff4nPCQ4kD0cvaOPq07b8AS Ome3UYW4lWHsQp0LzPzsHLjLT3DFvTciGBZu5R2QEaU23fIOTDsLZKgzkWeyCN9AJw9zSc IYNWZFoyAFKg7qGqkm2wYfHvLrZ9+hYb3X4zPrlBY3pjhIwfYvvr/WiW6t0uowJiEAQyC8 m4NdSLFjVbYxVO8jjXOq2fDe4MJXIRoY1Z+tfsoPP34EKB8KM/CVHmzAmMy8989rAvT64e DUX5EoEiTd8ig+Hgcp4i1r56Och9DmtZg9qpV+8Ou21FrbHgsdQC4PQ5FDjG0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Wed, 20 Jul 2022 20:44:22 +0300 Toomas Soome wrote: > On 20. Jul 2022, at 20:24, Dmitry Chagin wrote: >> 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 >> > > No, it is not correct. There's a similar change in eaf7aabddcde. >>> +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