Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jun 2015 10:48:49 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r284409 - in head/cddl/lib: libzfs libzfs_core
Message-ID:  <201506151048.t5FAmnF0039077@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Jun 15 10:48:48 2015
New Revision: 284409
URL: https://svnweb.freebsd.org/changeset/base/284409

Log:
  Fix circular dependency between libzfs and libzfs_core
  
  libzfs_core is the wrapper around kernel ioctls, the ioctl compat code belongs
  to it

Modified:
  head/cddl/lib/libzfs/Makefile
  head/cddl/lib/libzfs_core/Makefile

Modified: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile	Mon Jun 15 07:13:23 2015	(r284408)
+++ head/cddl/lib/libzfs/Makefile	Mon Jun 15 10:48:48 2015	(r284409)
@@ -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 \

Modified: head/cddl/lib/libzfs_core/Makefile
==============================================================================
--- head/cddl/lib/libzfs_core/Makefile	Mon Jun 15 07:13:23 2015	(r284408)
+++ head/cddl/lib/libzfs_core/Makefile	Mon Jun 15 10:48:48 2015	(r284409)
@@ -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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506151048.t5FAmnF0039077>