Page MenuHomeFreeBSD
Files F161726193

D53900.diff
No OneTemporary
Actions

D53900.diff
View Options

diff --git a/stand/defs.mk b/stand/defs.mk
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -59,9 +59,8 @@
SYSDIR= ${SRCTOP}/sys
UBOOTSRC= ${BOOTSRC}/uboot
ZFSSRC= ${SASRC}/zfs
-OZFS= ${SRCTOP}/sys/contrib/openzfs
-ZFSOSSRC= ${OZFS}/module/os/freebsd/
-ZFSOSINC= ${OZFS}/include/os/freebsd
+ZFSOSSRC= ${ZFSTOP}/module/os/freebsd/
+ZFSOSINC= ${ZFSTOP}/include/os/freebsd
LIBCSRC= ${SRCTOP}/lib/libc
BOOTOBJ= ${OBJTOP}/stand
diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
--- a/stand/libsa/zfs/Makefile.inc
+++ b/stand/libsa/zfs/Makefile.inc
@@ -1,12 +1,12 @@
.PATH: ${ZFSSRC}
.PATH: ${SYSDIR}/crypto/skein
.PATH: ${ZFSOSSRC}/spl
-.PATH: ${OZFS}/module/zstd
-.PATH: ${OZFS}/module/zstd/lib/common
-.PATH: ${OZFS}/module/zstd/lib/compress
-.PATH: ${OZFS}/module/zstd/lib/decompress
-.PATH: ${OZFS}/module/icp/asm-aarch64/blake3
-.PATH: ${OZFS}/module/icp/algs/blake3
+.PATH: ${ZFSTOP}/module/zstd
+.PATH: ${ZFSTOP}/module/zstd/lib/common
+.PATH: ${ZFSTOP}/module/zstd/lib/compress
+.PATH: ${ZFSTOP}/module/zstd/lib/decompress
+.PATH: ${ZFSTOP}/module/icp/asm-aarch64/blake3
+.PATH: ${ZFSTOP}/module/icp/algs/blake3
ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c
ZFS_SRC+= zfs_zstd.c
ZFS_SRC+= blake3.c blake3_generic.c blake3_impl.c
@@ -41,7 +41,7 @@
# from FreeBSD.
#
.for i in ${ZFS_SRC} ${ZSTD_SRC}
-CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \
+CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${ZFSTOP}/include \
-DNEED_SOLARIS_BOOLEAN
.endfor
@@ -76,7 +76,7 @@
CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA
-CFLAGS.blake3_impl.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include -DIN_LIBSA
+CFLAGS.blake3_impl.c+= -I${ZFSTOP}/module/icp/algs/blake3 -I${ZFSTOP}/module/icp/include -DIN_LIBSA
# Do not unroll skein loops, reduce code size
CFLAGS.skein_block.c+= -DSKEIN_LOOP=111

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 7, 7:04 AM (9 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34770326
Default Alt Text
D53900.diff (1 KB)

Event Timeline