D53791.id.diff
No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

D53791.id.diff
View Options

	diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile
	--- a/cddl/lib/drti/Makefile
	+++ b/cddl/lib/drti/Makefile
	@@ -12,11 +12,11 @@
	.undef LIBRARIES_ONLY
	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
	--- a/cddl/lib/libavl/Makefile
	+++ b/cddl/lib/libavl/Makefile
	@@ -1,4 +1,4 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
	+.PATH: ${ZFSTOP}/module/avl

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -8,9 +8,10 @@
	SRCS= avl.c
	WARNS?= 3
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	+
	.include <bsd.lib.mk>
	diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
	--- a/cddl/lib/libctf/Makefile
	+++ b/cddl/lib/libctf/Makefile
	@@ -22,10 +22,10 @@
	CFLAGS+= -DCTF_OLD_VERSIONS

	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID

	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
	--- a/cddl/lib/libdtrace/Makefile
	+++ b/cddl/lib/libdtrace/Makefile
	@@ -78,11 +78,11 @@

	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID


	diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
	--- a/cddl/lib/libicp/Makefile
	+++ b/cddl/lib/libicp/Makefile
	@@ -1,4 +1,4 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
	+.PATH: ${ZFSTOP}/module/icp

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -97,14 +97,14 @@
	SHLIB_MAJOR= 3
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile
	--- a/cddl/lib/libicp_rescue/Makefile
	+++ b/cddl/lib/libicp_rescue/Makefile
	@@ -1,4 +1,4 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
	+.PATH: ${ZFSTOP}/module/icp

	PACKAGE= utilities
	LIB= icp_rescue
	@@ -86,7 +86,7 @@
	core/kcf_prov_tabs.c \
	$(ASM_SOURCES_C)

	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs
	+.PATH: ${ZFSTOP}/module/zfs
	KERNEL_C+= zfs_impl.c

	SRCS= $(ASM_SOURCES_AS) $(KERNEL_C)
	@@ -95,14 +95,14 @@
	SHLIB_MAJOR= 3
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
	--- a/cddl/lib/libnvpair/Makefile
	+++ b/cddl/lib/libnvpair/Makefile
	@@ -1,6 +1,6 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/module/nvpair
	+.PATH: ${ZFSTOP}/lib/libnvpair
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -20,12 +20,12 @@

	WARNS?= 2
	CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC

	.include <bsd.lib.mk>
	diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
	--- a/cddl/lib/libspl/Makefile
	+++ b/cddl/lib/libspl/Makefile
	@@ -1,8 +1,8 @@
	.include <bsd.init.mk>
	.include <bsd.compiler.mk>

	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/lib/libspl
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -49,12 +49,12 @@
	WARNS?= 2
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
	.if ${COMPILER_TYPE} == "clang"
	diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
	--- a/cddl/lib/libtpool/Makefile
	+++ b/cddl/lib/libtpool/Makefile
	@@ -1,5 +1,5 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/lib/libtpool
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -14,13 +14,13 @@
	WARNS?= 2
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
	--- a/cddl/lib/libuutil/Makefile
	+++ b/cddl/lib/libuutil/Makefile
	@@ -1,4 +1,4 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
	+.PATH: ${ZFSTOP}/lib/libuutil

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -14,12 +14,12 @@

	WARNS?= 2
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h

	LIBADD= avl spl

	diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
	--- a/cddl/lib/libzdb/Makefile
	+++ b/cddl/lib/libzdb/Makefile
	@@ -1,5 +1,5 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/lib/libzdb
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -13,15 +13,15 @@
	WARNS?= 2
	CSTD= c99

	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/lib/libzutil
	CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
	--- a/cddl/lib/libzfs/Makefile
	+++ b/cddl/lib/libzfs/Makefile
	@@ -1,11 +1,11 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
	+.PATH: ${ZFSTOP}/module/icp
	+.PATH: ${ZFSTOP}/module/zcommon
	+.PATH: ${ZFSTOP}/lib/libzfs
	+.PATH: ${ZFSTOP}/lib/libzfs/os/freebsd
	+.PATH: ${ZFSTOP}/lib/libshare
	+.PATH: ${ZFSTOP}/include
	+.PATH: ${ZFSTOP}/module/zstd
	+.PATH: ${ZFSTOP}/module/zstd/lib

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -89,17 +89,17 @@
	SHLIB_MAJOR= 4
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libshare
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -DHAVE_EXECVPE
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
	diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
	--- a/cddl/lib/libzfs_core/Makefile
	+++ b/cddl/lib/libzfs_core/Makefile
	@@ -1,7 +1,7 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
	+.PATH: ${ZFSTOP}/lib/libzfs_core
	+.PATH: ${ZFSTOP}/include
	+.PATH: ${ZFSTOP}/include/os/freebsd/zfs
	+.PATH: ${ZFSTOP}/module/os/freebsd/zfs

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -17,17 +17,17 @@
	WARNS?= 2
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core
	+CFLAGS+= -I${ZFSTOP}/lib/libzfs_core/common
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
	--- a/cddl/lib/libzfsbootenv/Makefile
	+++ b/cddl/lib/libzfsbootenv/Makefile
	@@ -1,5 +1,5 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/lib/libzfsbootenv
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -20,16 +20,16 @@

	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
	CFLAGS.lzbe_device.c= -Wno-cast-qual
	CFLAGS.lzbe_util.c= -Wno-cast-qual
	CFLAGS.lzbe_pair.c= -Wno-cast-qual
	diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
	--- a/cddl/lib/libzpool/Makefile
	+++ b/cddl/lib/libzpool/Makefile
	@@ -261,7 +261,7 @@
	-I${ZFSTOP}/include \
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/sys \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	-I${ZFSTOP}/module/icp/include \
	diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
	--- a/cddl/lib/libzutil/Makefile
	+++ b/cddl/lib/libzutil/Makefile
	@@ -1,6 +1,6 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
	+.PATH: ${ZFSTOP}/lib/libzutil
	+.PATH: ${ZFSTOP}/lib/libzutil/os/freebsd
	+.PATH: ${ZFSTOP}/module/os/freebsd/zfs

	PACKAGE= zfs
	LIB_PACKAGE=
	@@ -27,15 +27,15 @@
	WARNS?= 2
	CSTD= c99

	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/lib/libzutil
	CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile
	--- a/cddl/lib/pam_zfs_key/Makefile
	+++ b/cddl/lib/pam_zfs_key/Makefile
	@@ -1,5 +1,5 @@
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key
	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include
	+.PATH: ${ZFSTOP}/contrib/pam_zfs_key
	+.PATH: ${ZFSTOP}/include

	PACKAGE= zfs
	LIB= pam_zfs_key
	@@ -13,17 +13,17 @@
	WARNS?= 2
	CSTD= c99
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd/zfs
	CFLAGS+= -DRUNSTATEDIR=\"/var/run\"

	.include "../../lib/libpam/modules/Makefile.inc"
	diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
	--- a/cddl/sbin/zpool/Makefile
	+++ b/cddl/sbin/zpool/Makefile
	@@ -65,7 +65,7 @@
	-I${ZFSTOP}/include \
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/sys \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	-I${ZFSTOP}/cmd/zpool \
	diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
	--- a/cddl/usr.bin/ctfconvert/Makefile
	+++ b/cddl/usr.bin/ctfconvert/Makefile
	@@ -25,9 +25,9 @@
	util.c

	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
	--- a/cddl/usr.bin/ctfdump/Makefile
	+++ b/cddl/usr.bin/ctfdump/Makefile
	@@ -8,9 +8,9 @@
	utils.c

	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \
	diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
	--- a/cddl/usr.bin/ctfmerge/Makefile
	+++ b/cddl/usr.bin/ctfmerge/Makefile
	@@ -25,9 +25,9 @@


	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
	--- a/cddl/usr.bin/zinject/Makefile
	+++ b/cddl/usr.bin/zinject/Makefile
	@@ -13,7 +13,7 @@
	-I${ZFSTOP}/include \
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/sys \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	-I${ZFSTOP}/module/icp/include \
	diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
	--- a/cddl/usr.bin/zstream/Makefile
	+++ b/cddl/usr.bin/zstream/Makefile
	@@ -23,7 +23,7 @@
	-I${ZFSTOP}/include \
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/sys \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	-I${ZFSTOP}/module/icp/include \
	diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
	--- a/cddl/usr.bin/ztest/Makefile
	+++ b/cddl/usr.bin/ztest/Makefile
	@@ -13,7 +13,7 @@
	-I${ZFSTOP}/include \
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/cddl/compat/opensolaris/include \
	-I${ZFSTOP}/module/icp/include \
	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
	diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
	--- a/cddl/usr.sbin/dtrace/Makefile
	+++ b/cddl/usr.sbin/dtrace/Makefile
	@@ -11,9 +11,9 @@

	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
	--- a/cddl/usr.sbin/lockstat/Makefile
	+++ b/cddl/usr.sbin/lockstat/Makefile
	@@ -11,9 +11,9 @@

	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
	diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile
	--- a/cddl/usr.sbin/plockstat/Makefile
	+++ b/cddl/usr.sbin/plockstat/Makefile
	@@ -11,9 +11,9 @@

	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \
	diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
	--- a/cddl/usr.sbin/zdb/Makefile
	+++ b/cddl/usr.sbin/zdb/Makefile
	@@ -16,7 +16,7 @@
	-I${ZFSTOP}/lib/libspl/include \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd \
	-I${ZFSTOP}/lib/libspl/include/os/freebsd/spl \
	- -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include \
	+ -I${ZFSTOP}/lib/libzpool/include \
	-I${SRCTOP}/sys \
	-include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \
	-DHAVE_ISSETUGID
	diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common
	--- a/cddl/usr.sbin/zfsd/Makefile.common
	+++ b/cddl/usr.sbin/zfsd/Makefile.common
	@@ -14,12 +14,12 @@
	IGNORE_PRAGMA= YES

	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/sys
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -I${SRCTOP}/cddl/usr.sbin

	CFLAGS+= -DHAVE_ISSETUGID
	diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
	--- a/cddl/usr.sbin/zhack/Makefile
	+++ b/cddl/usr.sbin/zhack/Makefile
	@@ -10,14 +10,14 @@

	WARNS?= 2
	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/include/Makefile b/include/Makefile
	--- a/include/Makefile
	+++ b/include/Makefile
	@@ -233,7 +233,7 @@
	TEKEN= teken.h
	TEKENDIR= ${INCLUDEDIR}/teken

	-.PATH: ${SRCTOP}/sys/contrib/openzfs/include/sys
	+.PATH: ${ZFSTOP}/include/sys
	NVPAIR= nvpair.h
	NVPAIRDIR= ${INCLUDEDIR}/sys

	diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile
	--- a/lib/libbe/Makefile
	+++ b/lib/libbe/Makefile
	@@ -53,15 +53,15 @@
	LIBADD+= zfsbootenv

	CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/lib/libzfs
	+CFLAGS+= -I${ZFSTOP}/lib/libzpool/include
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY
	CFLAGS.be.c= -Wno-cast-qual
	CFLAGS.be_access.c= -Wno-cast-qual
	diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile
	--- a/lib/libbe/tests/Makefile
	+++ b/lib/libbe/tests/Makefile
	@@ -14,12 +14,12 @@

	CFLAGS+= -I${SRCTOP}/lib/libbe
	CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID

	.include <bsd.test.mk>
	diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
	--- a/lib/libproc/Makefile
	+++ b/lib/libproc/Makefile
	@@ -20,10 +20,10 @@
	IGNORE_PRAGMA= YES
	CFLAGS+= -DIN_BASE
	CFLAGS+= -DSKIP_SPL_SYS_CONDVAR_H
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN -DHAVE_STRLCAT -DHAVE_STRLCPY
	CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
	-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
	diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
	--- a/lib/libprocstat/Makefile
	+++ b/lib/libprocstat/Makefile
	@@ -55,7 +55,6 @@
	.if ${MK_CDDL} != "no"
	CFLAGS+= -DLIBPROCSTAT_ZFS
	SRCS+= zfs.c
	-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
	CFLAGS.zfs.c+= -DIN_BASE
	CFLAGS.zfs.c+= -DHAVE_ISSETUGID
	CFLAGS.zfs.c+= -DZFS_DEBUG
	diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile
	--- a/sbin/bectl/Makefile
	+++ b/sbin/bectl/Makefile
	@@ -15,13 +15,13 @@
	pthread

	CFLAGS+= -DIN_BASE
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	+CFLAGS+= -I${ZFSTOP}/include
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/
	+CFLAGS+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	CFLAGS+= -I${SRCTOP}/sys
	CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
	-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS+= -I${ZFSTOP}/module/icp/include
	+CFLAGS+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS+= -DHAVE_ISSETUGID -DHAVE_STRLCAT -DHAVE_STRLCPY
	CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h

	diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
	--- a/usr.sbin/fstyp/Makefile
	+++ b/usr.sbin/fstyp/Makefile
	@@ -26,12 +26,12 @@

	CFLAGS+= -DHAVE_ZFS
	CFLAGS.zfs.c+= -DIN_BASE
	-CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/include
	-CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
	-CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
	-CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
	-CFLAGS.zfs.c+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
	-CFLAGS.zfs.c+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
	+CFLAGS.zfs.c+= -I${ZFSTOP}/include
	+CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include
	+CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libspl/include/os/freebsd
	+CFLAGS.zfs.c+= -I${ZFSTOP}/lib/libzpool/include
	+CFLAGS.zfs.c+= -I${ZFSTOP}/module/icp/include
	+CFLAGS.zfs.c+= -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h
	CFLAGS.zfs.c+= -DHAVE_ISSETUGID
	CFLAGS.zfs.c+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
	CFLAGS.zfs.c+= -Wno-cast-qual

File Metadata

Mime Type: text/plain
Expires: Wed, Nov 19, 7:24 PM (2 h, 46 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 25537324
Default Alt Text: D53791.id.diff (32 KB)

D53791.id.diffNo OneTemporaryActions

D53791.id.diffView Options

File Metadata

Event Timeline

D53791.id.diff
No OneTemporary
Actions

D53791.id.diff
View Options