From 13500839f2f74f939590564263f2b02410ee8b39 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 15 Jun 2015 10:48:48 +0000 Subject: [PATCH] Fix circular dependency between libzfs and libzfs_core libzfs_core is the wrapper around kernel ioctls, the ioctl compat code belongs to it --- cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzfs_core/Makefile | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b2f4352bf915..19a3f2e1b1b5 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -37,7 +37,6 @@ SRCS+= libzfs_changelist.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ - zfs_ioctl_compat.c \ zfs_namecheck.c \ zfs_prop.c \ zpool_prop.c \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index a470fbc25fb1..99ab34d90403 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -11,7 +11,8 @@ DPADD= ${LIBNVPAIR} LDADD= -lnvpair SRCS= libzfs_core.c \ - libzfs_core_compat.c + libzfs_core_compat.c \ + zfs_ioctl_compat.c SRCS+= libzfs_compat.c