From nobody Fri Jan 17 12:27:29 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 4YZJsG2JvBz5kvs7; Fri, 17 Jan 2025 12:27:30 +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 4YZJsF6R9Yz3V7W; Fri, 17 Jan 2025 12:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116849; 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=crEZghsHmMzsMpJ07IgzLaAPmHcb82b24S8+/To7Uqs=; b=xKnAvaOkGPvAjFbJAczO+Zb+GfMTYDrdgDlcbrqCng/XH8giFH/0x1QfpyXOckAoTdK6ag DlwzbcwuCywoOE/LbzIR7Gv9S8EG7Rb+9v8ELQ/tei9OKJU1qMNL/3mjfAQQyXhHUvkfTE Q4B9pAOmcKB8m9hOTYegghiS5j8/uXyhlH0u8zQeyZDzQu06rxipwLvJW/HYIIbr/u9iX4 4M0CHXifBE0j8qR+Md56sNWDV9c3HDuAnZJSmp1OuNaBix0MFCKeQMx1K+qhKtnl7eDIvx KkcQKrcP37YKJ7xzw64XbZAw28jyd3AUGlo/K88Y8PhuEr6PEeUewliBIpBkAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737116849; 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=crEZghsHmMzsMpJ07IgzLaAPmHcb82b24S8+/To7Uqs=; b=n8DPYaVoy8vnyw1h8ou6GAMjFxjyX0A89zbLML/XFoSOMT4MHckXYzRbnQ/9BJlcsMAvEt LQx9bVqGfSU1dOznI378nFrPCHxxZzpLXMtfPPPYej+9hbAnJJuZ0zfYA7HuVwSV1Dyti0 n+Hz/y8YzK4z5sd3mlxuNfacPV86lquisLG6UhVZ9YQRRQPD1zaxLaFrTwbUthidzrt56s wM30aKGN8/AaswQ1aw3rCBDBr5UF6ZZmRZ3fKDF9gH/lrVIYysqMYLT46IQTB51ttCiNbT YoxOYhpQ75HhQ1vxuOSGz6Iex1HPQ6GkACVpSLhzHI5G5UrQIXcPLeStJMbe8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737116849; a=rsa-sha256; cv=none; b=whgSYqeqUAh/Zg+NDM2MKkdPssm2pQsfRWcrm6/jAXh5p2o/KHviQBUlloainROn9lNLPX W/Cs5knEFG+IzhAsLWAXc6ewa4JWW08NHNmTI5K/R+4pJ74+CAhuxUQX/pF5Fh8GzDJiEn rkrERMj/mH47Qoluu5DsT6CX5ztH6aVfpUgWgekeUafB56QbhOBbbW0g7/1VcWMrhtttE1 FD7//7LZWfhFZ7k6pziCpK47Zhx+kIEOzWYM1TfPqOhgr+gTsHWqkdh/Km6AEvSAzzF+fo y4ABZzNzUep67hTzQepPLog6sfLRQURti7XKl0SR5H0/UXea3h25/2Q/ogwoew== 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 4YZJsF5gwPz2p6; Fri, 17 Jan 2025 12:27:29 +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 50HCRTCV053170; Fri, 17 Jan 2025 12:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HCRTFq053167; Fri, 17 Jan 2025 12:27:29 GMT (envelope-from git) Date: Fri, 17 Jan 2025 12:27:29 GMT Message-Id: <202501171227.50HCRTFq053167@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: 6f43ca650d64 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 6f43ca650d64d3d217fff9a4881f0cbea9f7efd0 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6f43ca650d64d3d217fff9a4881f0cbea9f7efd0 commit 6f43ca650d64d3d217fff9a4881f0cbea9f7efd0 Author: Olivier Certner AuthorDate: 2024-12-12 21:37:14 +0000 Commit: Olivier Certner CommitDate: 2025-01-17 12:24:55 +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}