From nobody Fri Jul 8 17:50:01 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 5FC6F17D0024; Fri, 8 Jul 2022 17:50:02 +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 4Lfglt0vg6z47yd; Fri, 8 Jul 2022 17:50:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302602; 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=hEUvDxHnUp8frqWqymlFGJQr2KNpm6+NGvG36eLk5Fk=; b=Ea2EjbAUDDupKbDTf1pbCaLi5gbcEPFYqFkcvOHZijSoN2l/SCSl/7jVHsyp5p1h+ckGuY aPdf63OzQcZqKjEKRY2EluqJo00sGFA2acft007PhF1h0WWVUGauMr6mc2P/un1hr4UIR8 mBZmU3TkV4blmi5JatP/oUUdA/3H2JnzItSibbHMB3Bu7glltHZYbw9nL9S1zjZsbDBmTX POd2xzLC4DTr5WDIuRLKwsa4E5HBGOSfMrv24WS7b/0b+SDDxHTIAciQZz35jXfYB1z5uK ap6zD+WyvP+CgKtlpTHmj76u0XGIwkVYdoHFjPHYMrDLMQcCpLs12O5DUZZQ5g== 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 4Lfgls6ytMzFXk; Fri, 8 Jul 2022 17:50:01 +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 268Ho1HC066186; Fri, 8 Jul 2022 17:50:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Ho1ax066183; Fri, 8 Jul 2022 17:50:01 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:50:01 GMT Message-Id: <202207081750.268Ho1ax066183@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: 451ac17a5030 - main - stans: Narrow the scope of includes and other flags 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=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: 451ac17a50303fec79797e900c7a37914adf9b37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302602; 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=hEUvDxHnUp8frqWqymlFGJQr2KNpm6+NGvG36eLk5Fk=; b=l6VuV2nN+ZQaCRxAPf8iNQou4s7RW42uNtR0EdRJkEDTTVsu+AT0NhNG/3xCHYPlRixqth xviun47U5ZOo1grIxry8fq2tmAkKn/Pukbt2ba1uAHTVDTzDlr6OPqOGSuXyZTU1H+VtR0 Q0nCcfaTdgcFWFNeTs4tvdNS+KZ9942GLEBqBdClnTdq0myYKLg0v1IYkRaA46HCGxaW2e YFSiaZBdtYDkjlbLzcTMzUyh3tMDzm7eUXPryBEYY47XBj6WJSyr1wU8mXXbiWc2oJGgUk u8wC8ANdmJq4R8EcxNB4AIpE9dlE3NFR0gw9rIuqQLXZQJNT8GJduM8KEhHBGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302602; a=rsa-sha256; cv=none; b=USZWz0mDevUokIJd+9b54QySpw/ldMyTavNQwqNwmFRD2XLyhTmF6YYqhRYQ6B8T8xSnp3 Io0/CU+Y9KVIQLTjUpRLhy8ypsNqK4X0yYpgl2zzUg8sp/csKY708W+3mE/xSGxNtP2pv5 uI6Rbli316sfGXXbUnvIBZSfarqKRVhzhYSp5cURpyIbfOQBf0AZcAwgLp0y0/JXDuOJg6 N1G9915tXxoqgAiTy+yIbPm4ktrkEA2+vBMk2ytb2Skzuemks38Vp16ak7EncUFJro9nh9 O+oHlgw0+5Dn8oPATVkdaJhXR41jxJA+85SWEYFAnl91BJFoodArNX0ljnrmzg== 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=451ac17a50303fec79797e900c7a37914adf9b37 commit 451ac17a50303fec79797e900c7a37914adf9b37 Author: Warner Losh AuthorDate: 2022-07-08 15:42:34 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:36 +0000 stans: Narrow the scope of includes and other flags CFLAGS+= here affects *ALL* libsa files being built. However, this is only needed for zfs.c, so define it only for this. Also, use the defines from defs.mk. Move all the zfs.c include hacks together. Also, move the -Wformat -Wall warnings that were added to CFLAGS+= to the individual files instead for the same reason. Sponsored by: Netflix --- stand/libsa/zfs/Makefile.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 841b1b5c327c..f847af8949ff 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -30,6 +30,7 @@ ZFS_EARLY= -I${ZFSOSINC} \ .for i in ${ZFS_SRC} ${ZSTD_SRC} CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h +CFLAGS.$i+= -Wformat -Wall .endfor CFLAGS_EARLY.list.c+= ${ZFS_EARLY} @@ -39,7 +40,9 @@ CFLAGS_EARLY.zstd_shim.c+= ${ZFS_EARLY} # the zfs code that need to be unified. CFLAGS.nvlist.c+= -I${ZFSOSINC}/spl CFLAGS.zfs.c+= -I${ZFSOSINC}/spl \ - -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 + -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 \ + -I${ZFSOSINC}/zfs \ + -I${OZFS}/include # # ZSTD coding style has some issues, so suppress clang's warnings. Also, zstd's @@ -53,9 +56,3 @@ CFLAGS.zstd_shim.c+= -DIN_BASE -DIN_LIBSA -I${OZFS}/include # Do not unroll skein loops, reduce code size CFLAGS.skein_block.c+= -DSKEIN_LOOP=111 - -CFLAGS+= -I${SYSDIR}/contrib/openzfs/include -CFLAGS+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs -CFLAGS.zfs.c+= -I${SYSDIR}/cddl/contrib/opensolaris/common/lz4 - -CFLAGS+= -Wformat -Wall