summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorchs <chs@NetBSD.org>2018-05-28 21:04:59 +0000
committerchs <chs@NetBSD.org>2018-05-28 21:04:59 +0000
commiteada09acaeaeefa47b9692e7d920bf851863dfb7 (patch)
treecd53eb38844283a2a5b01c3cb1c9539d8ad6de25 /lib
parentdefb6b6ddc595a2a77bd37b2d01ff89341730763 (diff)
merge a new version of the CDDL dtrace and ZFS code.
this changes the upstream vendor from OpenSolaris to FreeBSD, and this version is based on FreeBSD svn r315983. in addition to the 10 years of improvements from upstream, this version also has these NetBSD-specific enhancements: - dtrace FBT probes can now be placed in kernel modules. - ZFS now supports mmap().
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index e651596e8f8..df7de3ee64e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.256 2018/05/03 22:27:58 sevan Exp $
+# $NetBSD: Makefile,v 1.257 2018/05/28 21:05:00 chs Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -141,7 +141,7 @@ SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread
.endif
.if (${MKZFS} != "no")
-SUBDIR+= ../external/cddl/osnet/lib/libzfs
+SUBDIR+= ../external/cddl/osnet/lib/libzfs_core
SUBDIR+= ../external/cddl/osnet/lib/libzpool
.endif
@@ -210,6 +210,10 @@ SUBDIR+= ../external/bsd/fetch/lib # depends on libssl
SUBDIR+= ../external/bsd/openldap/lib # depends on libcrypto, ...
.endif
+.if (${MKZFS} != "no")
+SUBDIR+= ../external/cddl/osnet/lib/libzfs
+.endif
+
SUBDIR+= ../libexec/httpd/libbozohttpd # depends on libssl & libcrypto
#==================== 3rd library dependency barrier ====================