aboutsummaryrefslogtreecommitdiff
path: root/cddl/lib
diff options
context:
space:
mode:
authorRyan Moeller <freqlabs@FreeBSD.org>2020-08-26 19:03:15 +0000
committerRyan Moeller <freqlabs@FreeBSD.org>2020-08-26 19:03:15 +0000
commit507cf10ad5c12030cf811c85f9eb3ead46747d9b (patch)
tree1c7a48e3131092bd7c7cc0870aa8e14e22a4f92b /cddl/lib
parent67c97ec2d606a50f2c288408773a53ad7fb8beee (diff)
downloadsrc-507cf10ad5c12030cf811c85f9eb3ead46747d9b.tar.gz
src-507cf10ad5c12030cf811c85f9eb3ead46747d9b.zip
Move zstd sources from libzfs to libzpool
zstd is kernel code that was not supposed to be in libzfs. libzpool provides userland shims for kernel code and is where the zstd code needs to be included. Reported by: John Kennedy Discussed with: mmacy Sponsored by: iXsystems, Inc.
Notes
Notes: svn path=/head/; revision=364830
Diffstat (limited to 'cddl/lib')
-rw-r--r--cddl/lib/libzfs/Makefile6
-rw-r--r--cddl/lib/libzpool/Makefile8
2 files changed, 8 insertions, 6 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index f10acd93a852..6cee41cb732d 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -58,10 +58,6 @@ KERNEL_C = \
zprop_common.c
-KERNEL_C+= zstd.c \
- zfs_zstd.c
-
-
ARCH_C =
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
ARCH_C += zfs_fletcher_intel.c \
@@ -94,8 +90,6 @@ 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
CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
-CFLAGS.zstd.c= -fno-tree-vectorize
.include <bsd.lib.mk>
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 536ad490fb2d..5edeee86d4e6 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -8,6 +8,9 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/module/unicode
# LUA_SRCS
.PATH: ${ZFSTOP}/module/lua
+# ZSTD_SRCS
+.PATH: ${ZFSTOP}/module/zstd
+.PATH: ${ZFSTOP}/module/zstd/lib
.PATH: ${ZFSTOP}/module/os/linux/zfs
@@ -44,6 +47,7 @@ KERNEL_C = \
zfs_namecheck.c \
zfs_prop.c \
zfs_uio.c \
+ zfs_zstd.c \
zpool_prop.c \
zprop_common.c \
abd.c \
@@ -167,6 +171,7 @@ KERNEL_C = \
zio_inject.c \
zle.c \
zrlock.c \
+ zstd.c \
zthr.c
ARCH_C =
@@ -252,4 +257,7 @@ CSTD= c99
CFLAGS+= -g -DDEBUG=1
+CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
+CFLAGS.zstd.c+= -fno-tree-vectorize
+
.include <bsd.lib.mk>