Page MenuHomeFreeBSD
Files F102999185

D35887.id108443.diff
No OneTemporary
Actions

D35887.id108443.diff
View Options

Index: stand/efi/boot1/Makefile
===================================================================
--- stand/efi/boot1/Makefile
+++ stand/efi/boot1/Makefile
@@ -41,6 +41,7 @@
CFLAGS.zfs_module.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs
CFLAGS.zfs_module.c+= -I${SYSDIR}/cddl/contrib/opensolaris/common/lz4
CFLAGS.zfs_module.c+= -include ${ZFSOSINC}/spl/sys/ccompile.h
+CFLAGS.zfs_module.c+= -DHAS_ZSTD_ZFS
CFLAGS+= -DEFI_ZFS_BOOT
.endif
Index: stand/i386/gptzfsboot/Makefile
===================================================================
--- stand/i386/gptzfsboot/Makefile
+++ stand/i386/gptzfsboot/Makefile
@@ -26,6 +26,7 @@
-DSIOPRT=${BOOT_COMCONSOLE_PORT} \
-DSIOFMT=${B2SIOFMT} \
-DSIOSPD=${BOOT_COMCONSOLE_SPEED} \
+ -DHAS_ZSTD_ZFS \
-I${LDRSRC} \
-I${BOOTSRC}/i386/common \
-I${BOOTSRC}/i386/libi386 \
Index: stand/libsa/zfs/Makefile.inc
===================================================================
--- stand/libsa/zfs/Makefile.inc
+++ stand/libsa/zfs/Makefile.inc
@@ -20,13 +20,8 @@
ZSTD_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c
ZSTD_SRC+= zstd_opt.c
-CFLAGS+= -DHAS_ZSTD_ZFS
SRCS+= ${ZFS_SRC} ${ZSTD_SRC}
-CFLAGS+= -I${LDRSRC}
-CFLAGS+= -I${SYSDIR}/cddl/boot/zfs
-CFLAGS+= -I${SYSDIR}/crypto/skein
-
#
# Any file that needs the FreeBSD overrides that are in
# include/os/freebssd/spl/XXX needs to have these added to
@@ -49,6 +44,7 @@
# from FreeBSD.
#
.for i in ${ZFS_SRC} ${ZSTD_SRC}
+CFLAGS.$i+= -I${SYSDIR}/cddl/boot/zfs
CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \
-DNEED_SOLARIS_BOOLEAN
.endfor
@@ -63,7 +59,10 @@
# Can't use the early flags because there's two conflicting definitions of boolean_t in
# the zfs code that need to be unified, as well as a number of other hacks for pre-openzfs
# code still in the tree that needs to be fixed.
-CFLAGS.zfs.c+= -I${ZFSOSINC}/spl \
+CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \
+ -I${LDRSRC} \
+ -I${SYSDIR}/crypto/skein \
+ -I${ZFSOSINC}/spl \
-I${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4 \
-I${ZFSOSINC}/zfs \
-I${OZFS}/include

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 4:05 PM (21 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14742137
Default Alt Text
D35887.id108443.diff (2 KB)

Event Timeline