svn commit: r327305 - in head/sysutils/py-zfs: . files

[Martin Matuska]

Author: mm
Date: Sat Sep 14 17:10:29 2013
New Revision: 327305
URL: http://svnweb.freebsd.org/changeset/ports/327305

Log:
  Unbreak build with libzfs_core

Added:
  head/sysutils/py-zfs/files/Makefile.lib.v28
     - copied unchanged from r327303, head/sysutils/py-zfs/files/Makefile.lib
Modified:
  head/sysutils/py-zfs/Makefile
  head/sysutils/py-zfs/files/Makefile.lib

Modified: head/sysutils/py-zfs/Makefile
==============================================================================
--- head/sysutils/py-zfs/Makefile	Sat Sep 14 17:06:54 2013	(r327304)
+++ head/sysutils/py-zfs/Makefile	Sat Sep 14 17:10:29 2013	(r327305)
@@ -7,7 +7,7 @@
 
 PORTNAME=	zfs
 PORTVERSION=	1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils python
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -41,6 +41,10 @@ PYFILES=	__init__.py \
 IGNORE=	requires ZFS v15 or higher sources with pyzfs (in ${SRCDIR})
 .endif
 
+.if !exists(${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h)
+MAKEFILE=	${FILESDIR}/Makefile.lib.v28
+.endif
+
 .if exists(${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common/holds.py) && \
 exists(${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common/table.py)
 PYFILES+=	holds.py \

Modified: head/sysutils/py-zfs/files/Makefile.lib
==============================================================================
--- head/sysutils/py-zfs/files/Makefile.lib	Sat Sep 14 17:06:54 2013	(r327304)
+++ head/sysutils/py-zfs/files/Makefile.lib	Sat Sep 14 17:10:29 2013	(r327305)
@@ -8,8 +8,8 @@ SRCS=	ioctl.c
 
 SHLIB_NAME=	ioctl.so
 LIB=	ioctl
-DPADD=	${LIBGEOM} ${LIBZFS} ${LIBNVPAIR} ${LIBUUTIL}
-LDADD=	-lgeom -lzfs -lnvpair -luutil ${PYTHON_LDFLAGS}
+DPADD=	${LIBGEOM} ${LIBZFS} ${LIBZFS_CORE} ${LIBNVPAIR} ${LIBUUTIL}
+LDADD=	-lgeom -lzfs -lzfs_core -lnvpair -luutil ${PYTHON_LDFLAGS}
 
 CFLAGS+= -DNEED_SOLARIS_BOOLEAN
 CFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
@@ -24,6 +24,7 @@ CFLAGS+= -I${SRCDIR}/cddl/contrib/openso
 CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${PYTHON_INCLUDEDIR}
 

Copied: head/sysutils/py-zfs/files/Makefile.lib.v28 (from r327303, head/sysutils/py-zfs/files/Makefile.lib)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-zfs/files/Makefile.lib.v28	Sat Sep 14 17:10:29 2013	(r327305, copy of r327303, head/sysutils/py-zfs/files/Makefile.lib)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+SRCDIR?=	/usr/src
+
+.PATH:	${SRCDIR}/cddl/contrib/opensolaris/lib/pyzfs/common
+
+SRCS=	ioctl.c
+
+SHLIB_NAME=	ioctl.so
+LIB=	ioctl
+DPADD=	${LIBGEOM} ${LIBZFS} ${LIBNVPAIR} ${LIBUUTIL}
+LDADD=	-lgeom -lzfs -lnvpair -luutil ${PYTHON_LDFLAGS}
+
+CFLAGS+= -DNEED_SOLARIS_BOOLEAN
+CFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${PYTHON_INCLUDEDIR}
+
+.include <bsd.lib.mk>