From owner-svn-ports-head@FreeBSD.ORG Sat Sep 14 17:10:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1DCC657A; Sat, 14 Sep 2013 17:10:30 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0AF77201E; Sat, 14 Sep 2013 17:10:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8EHATjd054012; Sat, 14 Sep 2013 17:10:29 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8EHATui054003; Sat, 14 Sep 2013 17:10:29 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201309141710.r8EHATui054003@svn.freebsd.org> From: Martin Matuska Date: Sat, 14 Sep 2013 17:10:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327305 - in head/sysutils/py-zfs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2013 17:10:30 -0000 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