diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2013-09-14 17:10:29 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2013-09-14 17:10:29 +0000 |
| commit | 26d839497d3d5cd476d4134cada32d24616389ca (patch) | |
| tree | a92ef8cb26903040adb288ec99271c7780473097 /sysutils | |
| parent | - A patch to fix preview graphs (diff) | |
Unbreak build with libzfs_core
Notes
Notes:
svn path=/head/; revision=327305
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/py-zfs/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/py-zfs/files/Makefile.lib | 5 | ||||
| -rw-r--r-- | sysutils/py-zfs/files/Makefile.lib.v28 | 30 |
3 files changed, 38 insertions, 3 deletions
diff --git a/sysutils/py-zfs/Makefile b/sysutils/py-zfs/Makefile index 27c7d389c2a9..35ec977dc2d0 100644 --- a/sysutils/py-zfs/Makefile +++ b/sysutils/py-zfs/Makefile @@ -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 \ diff --git a/sysutils/py-zfs/files/Makefile.lib b/sysutils/py-zfs/files/Makefile.lib index e26574cabc0d..e5a351ee58b8 100644 --- a/sysutils/py-zfs/files/Makefile.lib +++ b/sysutils/py-zfs/files/Makefile.lib @@ -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/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_core/common CFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${PYTHON_INCLUDEDIR} diff --git a/sysutils/py-zfs/files/Makefile.lib.v28 b/sysutils/py-zfs/files/Makefile.lib.v28 new file mode 100644 index 000000000000..e26574cabc0d --- /dev/null +++ b/sysutils/py-zfs/files/Makefile.lib.v28 @@ -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> |