From nobody Thu Dec 19 22:36:56 2024 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 4YDllr6HDgz5hrHW; Thu, 19 Dec 2024 22:36:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YDllr5TWDz4fqh; Thu, 19 Dec 2024 22:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734647816; 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=sugfyJaaWq2U1Hjqo7r0KrBbFFHwHskvEanzn35e5gA=; b=wCR1vMy5lIuzj8gxO2SysC6Nlp9aq3ESBvIRFm+xGj6CRU4pLHfwzfQubNxO7yxichOtsY LfRcq0SHVQ2Xdv8YKCyfUMubGFrkyjL2xLh3IuJo3Wtk6qc9Y43iGPR6AwBC5bPpPCFwja H1LezPYvxAbHJq6+bZ+NaPFjSYe9TcnEaghPSX6ppsiDqcD4Qi9kaxIT1WW3DKHI0Z3BrN cCY9sDzsIYYKnXl7ygc6ahi5T4OSszvMH1gugidK7WOdBR6lCGwSer+fni/3rBJLwMaHz5 HY16/KAMZWK79epFfPTkUpZUyscz2Mf8tL+bmzXhYFLxq8d3nPXkA1OqTaKzGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734647816; 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=sugfyJaaWq2U1Hjqo7r0KrBbFFHwHskvEanzn35e5gA=; b=aM+zGc1H7M5Cc/nnUmJIrr219TI4rUzVLBHpGWX6kGfnHipeI2M63bv5Guw+M2C2cVM1VD dsbINIWeTtuspEeCGzpZVl/bMRV8TztsMb4F0FKVNwkt2Pz9v1ccqWgffJ00SNJr2+ax92 aLR4S04kcv0YgTGQmdOjNsy4QxjOBA3KW7N+l+/piZjSgE/pLJYZMYtxIB+V1zZEH3zyiW hl1n78kvxwfpCpVlNNKylSOTUPL4f1jxL4FFpXWaA35XDbKa3x05RI/Rlb3w6Bj0C5eFB+ FmeVEgeB2W20W95rGmrMDjZkCc3X1ESyuwSKHUNYnJyiN64WLZwY/Oge3LZNGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734647816; a=rsa-sha256; cv=none; b=HhDlkSHNwIggTWPvQhWdejZGAzQiQTrOYTvia433uTzk4uWOEodpjFYBnTvN41U2DrQdXw G7J6Q3fzh75qNl24qqwmZKxn2ltR076IQakKRjoHAt4bxWgkh28Y5JMmrO+6uUKDWDCHUd DqpPn3A50nL7fIU91gzsM3QhG0Lg/OPvbtSOsQxDGUbAfYIyf83p0J43mDHnX+2FbKYuQv 9O6u9L52a7bilVwvHP2371awMpCHwQ83t8oj46yKGxo8lJfZpDSUAlDTNonRnYoGKuRrTQ btdGJ59ul1u7vcMr2egRP7vXMEmvPHoj1BOn6TLQ4AnCk3bANct9dpBgOOYHSw== 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 4YDllr557pz1BQd; Thu, 19 Dec 2024 22:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BJMaudG098698; Thu, 19 Dec 2024 22:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BJMaulJ098695; Thu, 19 Dec 2024 22:36:56 GMT (envelope-from git) Date: Thu, 19 Dec 2024 22:36:56 GMT Message-Id: <202412192236.4BJMaulJ098695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 618c97b87b71 - main - libprocstat: ZFS support: Makefile: Tidy up a bit 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 618c97b87b7124cdfb10d2f33a213c3302c8a98b Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=618c97b87b7124cdfb10d2f33a213c3302c8a98b commit 618c97b87b7124cdfb10d2f33a213c3302c8a98b Author: Olivier Certner AuthorDate: 2024-12-12 21:37:14 +0000 Commit: Olivier Certner CommitDate: 2024-12-19 22:36:06 +0000 libprocstat: ZFS support: Makefile: Tidy up a bit Regroup assignments tweaking preprocessor defines/undefs, and separately those about include directories. Re-order include directories a bit more logically, and remove redundant ones. Separate logical groups by blank lines. Build artifacts have been verified to stay the same when produced with an external LLVM 18 toolchain. MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48070 --- lib/libprocstat/zfs/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/libprocstat/zfs/Makefile b/lib/libprocstat/zfs/Makefile index 9efe8918492c..5e1ebd44d1d3 100644 --- a/lib/libprocstat/zfs/Makefile +++ b/lib/libprocstat/zfs/Makefile @@ -6,19 +6,23 @@ WARNS?= 1 FORTIFY_SOURCE= 0 -CFLAGS+= -DIN_BASE -D__KERNEL__ -D_KERNEL -I. -I${.CURDIR} +# We fake a kernel compilation environment in order to get the definition for +# 'zpool_t'. +CFLAGS+= -DIN_BASE -D__KERNEL__ -D_KERNEL -UKLD_TIED -DKLD_MODULE +CFLAGS+= -DHAVE_ISSETUGID -D_SYS_VMEM_H_ + +CFLAGS+= -fno-builtin -nostdlib + +CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl -CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include - -CFLAGS+= -I${SRCTOP}/sys -I. -I.. CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include -CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h -CFLAGS+= -DHAVE_ISSETUGID -D_SYS_VMEM_H_ -UKLD_TIED -DKLD_MODULE +CFLAGS+= -I${SRCTOP}/sys -I. -I.. -CFLAGS+= -fno-builtin -nostdlib +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h all: ${OBJS} CLEANFILES= ${OBJS}