From nobody Thu Jan 16 18:08:39 2025 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 4YYrTP0Ch5z5kkmV; Thu, 16 Jan 2025 18:08:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYrTN0vsRz3S9T; Thu, 16 Jan 2025 18:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050920; 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=lfY33TGrAI9aQ8nv9VruCPrwMSBjQYKtx7heAi1DhAo=; b=VX807GAUyuL9vzXoSd6GZqFouZq9kt5AderBKeo82EY9ZMrl38HN/FP3Aa8g46P39RIR3Q b76gqdp1i1+3vbLTn0C6AoGsfxrbPZZsmw47HF4kyQsLKmAAEP1Motl9yxneFew3WE0usD +gbTnyL+KApVGJhkbZZICuw+0hIgS70eWgCkaTIl3kj6u6TXOlVrw3Xf3/i2ZMe7HqSq1W G5+qwZwFKY6L0a30mY4ycAy0Ks49fLijVY/q2QXnMAsrf42H7xW1aeyDvzz2/v1tyTk5zo 8B96H8GxSfMIEsvOAkrGwgTnjQVEYfPJ1i2UUG9XMtvUYB6rckrFGNnu3XWPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737050920; 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=lfY33TGrAI9aQ8nv9VruCPrwMSBjQYKtx7heAi1DhAo=; b=pgqVrEVzKUhxwrVjfXkAliKtaywB/cpJoOMI74d+1mLLephzvNQtMtPkOnY4FI1cJyARJU RVTwS1M/TduZjYHwB23V7ufjraxFRflZDmPHreVTjvpMfb5FljAjf5XTrltd7qAK2Y4084 AHqhfF4weugYWf5Ndr+qAwjccgYlYordXNEN0uCPbMfL0T+8jap5SC1VufWtZbL2lRUrB3 GkYugu+gW7Ry8TeTqRP2mIavTGJATA8SF7bi54SzUGz3VHpqMTFXVIcZuWbSH4JLtgmP26 j+JZyico4ZcgxUSLteJo0OpMSjG4d2wiHJhzP0SgCN1FzlUTJcMeSvkQq+sPRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737050920; a=rsa-sha256; cv=none; b=hTcIWWrNNEztOd26dUAEbxUgbI2ECV7RI6kOEbV764ki+R4H4mToG5A6ZRaQielAXjuwCA a1xWKJDGbVfXY6YnWDrdtpChFGGsaROZmnXSQd9VvZCv+VF+zA1JPX1pmTCJYrm8DuJr/Y t538WnmVGwCwxxCsh0FyMEhcpsNvz4y695tzxE6iA8KNTPKkbl0WtMYHO1Vy293TzjxhKK IefqB4YeBuzxFRT3e+c4huf7vPAWq7cp7rCn2MA2ajSAKA8D83jJ0wZiN4TQBACw1al/3q /70PCb9JFyemtTFAxB8CY/Ql6UOkAOeBqt+Js37orNw/PKrpGu6bZBXdmGQRUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YYrTN0T90zkKl; Thu, 16 Jan 2025 18:08:40 +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 50GI8d0G092913; Thu, 16 Jan 2025 18:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GI8dpG092910; Thu, 16 Jan 2025 18:08:39 GMT (envelope-from git) Date: Thu, 16 Jan 2025 18:08:39 GMT Message-Id: <202501161808.50GI8dpG092910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 76d0aed16439 - stable/14 - libprocstat: ZFS support: Makefile: Tidy up a bit 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 76d0aed16439c58c4919973436400b067ad434cc Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=76d0aed16439c58c4919973436400b067ad434cc commit 76d0aed16439c58c4919973436400b067ad434cc Author: Olivier Certner AuthorDate: 2024-12-12 21:37:14 +0000 Commit: Olivier Certner CommitDate: 2025-01-16 18:07:02 +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 (cherry picked from commit 618c97b87b7124cdfb10d2f33a213c3302c8a98b) --- 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 da689fdd3e81..10448b0bfab9 100644 --- a/lib/libprocstat/zfs/Makefile +++ b/lib/libprocstat/zfs/Makefile @@ -6,19 +6,23 @@ OBJS= zfs_defs.o WARNS?= 1 -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}