Index: sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
===================================================================
--- sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	(révision 284408)
+++ sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c	(copie de travail)
@@ -44,7 +44,15 @@
 #endif
 #define	skip_whitespace(p)	while ((*(p) == ' ') || (*(p) == '\t')) p++
 
+#if defined(__FreeBSD__) && !defined(_KERNEL)
 /*
+ * libnvpair is the lowest commen denominator for ZFS related libraries,
+ * defining aok here makes it usable by all ZFS related libraries
+ */
+int aok;
+#endif
+
+/*
  * nvpair.c - Provides kernel & userland interfaces for manipulating
  *	name-value pairs.
  *
Index: cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
===================================================================
--- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	(révision 284408)
+++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c	(copie de travail)
@@ -55,7 +55,9 @@
 #include "zfs_prop.h"
 #include "zfeature_common.h"
 
+#ifndef __FreeBSD__
 int aok;
+#endif
 
 int
 libzfs_errno(libzfs_handle_t *hdl)
Index: cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
===================================================================
--- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	(révision 284408)
+++ cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	(copie de travail)
@@ -45,7 +45,9 @@
  * Emulation of kernel services in userland.
  */
 
+#ifndef __FreeBSD__
 int aok;
+#endif
 uint64_t physmem;
 vnode_t *rootdir = (vnode_t *)0xabcd1234;
 char hw_serial[HW_HOSTID_LEN];
Index: cddl/lib/libzfs_core/Makefile
===================================================================
--- cddl/lib/libzfs_core/Makefile	(révision 284409)
+++ cddl/lib/libzfs_core/Makefile	(copie de travail)
@@ -9,6 +9,7 @@
 LIB=	zfs_core
 DPADD=	${LIBNVPAIR}
 LDADD=	-lnvpair
+LIBADD=	nv
 
 SRCS=	libzfs_core.c \
 	libzfs_core_compat.c \