diff options
| author | mm <mm@FreeBSD.org> | 2013-03-05 08:09:53 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-03-05 08:09:53 +0000 |
| commit | 99f883783c89d10b9d02e77393eb9d0a307f3ca0 (patch) | |
| tree | 669ea5740806cbf29b6e064275d3f5a62478bd47 /cddl/lib | |
| parent | 712512f2cc075f7890eaf59c6aa392f330857ff9 (diff) | |
| parent | d5063724619a16bd1592c39395c787e97be18693 (diff) | |
| download | FreeBSD-src-99f883783c89d10b9d02e77393eb9d0a307f3ca0.zip FreeBSD-src-99f883783c89d10b9d02e77393eb9d0a307f3ca0.tar.gz | |
WiP merge of libzfs_core (MFV r238590, r238592)
not yet working, ioctl handling needs to be changed
Diffstat (limited to 'cddl/lib')
| -rw-r--r-- | cddl/lib/Makefile | 2 | ||||
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 6 | ||||
| -rw-r--r-- | cddl/lib/libzfs_core/Makefile | 33 |
3 files changed, 39 insertions, 2 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 14c73b5..53d402a 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -9,10 +9,12 @@ SUBDIR= ${_drti} \ libnvpair \ libumem \ libuutil \ + ${_libzfs_core} \ ${_libzfs} \ ${_libzpool} .if ${MK_ZFS} != "no" +_libzfs_core= libzfs_core _libzfs= libzfs .if ${MK_LIBTHR} != "no" _libzpool= libzpool diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 9e68da4..7397cae 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -6,8 +6,9 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} -LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair +DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ + ${LIBZFS_CORE} +LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lzfs_core SRCS= deviceid.c \ fsshare.c \ @@ -54,5 +55,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common .include <bsd.lib.mk> diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile new file mode 100644 index 0000000..5f2fc57 --- /dev/null +++ b/cddl/lib/libzfs_core/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common + +LIB= zfs_core +DPADD= ${LIBNVPAIR} +LDADD= -lnvpair + +SRCS= libzfs_core.c + +WARNS?= 0 +CSTD= c99 +CFLAGS+= -DZFS_NO_ACL +CFLAGS+= -I${.CURDIR}/../../../sbin/mount +CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include +CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head +CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common +CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common + +.include <bsd.lib.mk> |
