diff options
| author | Toomas Soome <tsoome@FreeBSD.org> | 2019-12-02 11:44:39 +0000 |
|---|---|---|
| committer | Toomas Soome <tsoome@FreeBSD.org> | 2019-12-02 11:44:39 +0000 |
| commit | e29deff94d4e877f35a40511931e0ae58a2e1d62 (patch) | |
| tree | 3d6de5bf699448d400c7d7d04fed0724cc359395 /sys/modules/zfs | |
| parent | 88c73ad62bdc0d2106d8b997997964b0213a47a7 (diff) | |
| download | src-e29deff94d4e877f35a40511931e0ae58a2e1d62.tar.gz src-e29deff94d4e877f35a40511931e0ae58a2e1d62.zip | |
MFC r354253, r354254, r354264, r354265
Remove duplicate lz4 implementations
Port illumos change: https://www.illumos.org/issues/11667
Move lz4.c out of zfs tree to opensolaris/common/lz4, adjust it to be
usable from kernel/stand/userland builds, so we can use just one single
source. Add lz4.h to declare lz4_compress() and lz4_decompress().
Differential Revision: https://reviews.freebsd.org/D22037
Notes
Notes:
svn path=/stable/12/; revision=355285
Diffstat (limited to 'sys/modules/zfs')
| -rw-r--r-- | sys/modules/zfs/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 011c07045eb7..fb0600376d75 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -18,6 +18,8 @@ SRCS+= opensolaris_nvpair_alloc_fixed.c SRCS+= opensolaris_fnvpair.c .PATH: ${SYSDIR}/cddl/contrib/opensolaris/common/unicode SRCS+= u8_textprep.c +.PATH: ${SUNW}/common/lz4 +SRCS+= lz4.c .PATH: ${SYSDIR}/cddl/compat/opensolaris/kern SRCS+= opensolaris_acl.c @@ -93,6 +95,7 @@ CFLAGS+=-I${SUNW}/uts/common/zmod CFLAGS+=-I${SUNW}/uts/common CFLAGS+=-I${SYSDIR} CFLAGS+=-I${SUNW}/common/zfs +CFLAGS+=-I${SUNW}/common/lz4 CFLAGS+=-I${SUNW}/common CFLAGS+=-DBUILDING_ZFS CFLAGS.gcc+=-fms-extensions |