git: 6f43ca650d64 - stable/13 - libprocstat: ZFS support: Makefile: Tidy up a bit

The branch stable/13 has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=6f43ca650d64d3d217fff9a4881f0cbea9f7efd0

commit 6f43ca650d64d3d217fff9a4881f0cbea9f7efd0
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2024-12-12 21:37:14 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
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}