Index: head/cddl/lib/libavl/Makefile =================================================================== --- head/cddl/lib/libavl/Makefile (revision 351849) +++ head/cddl/lib/libavl/Makefile (revision 351850) @@ -1,11 +1,12 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl +PACKAGE= runtime LIB= avl SRCS= avl.c WARNS?= 3 CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common .include Index: head/cddl/lib/libnvpair/Makefile =================================================================== --- head/cddl/lib/libnvpair/Makefile (revision 351849) +++ head/cddl/lib/libnvpair/Makefile (revision 351850) @@ -1,35 +1,36 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/nvpair LIB= nvpair +PACKAGE= runtime INCS= libnvpair.h SRCS= libnvpair.c \ nvpair_alloc_system.c \ nvpair_json.c \ opensolaris_fnvpair.c \ opensolaris_nvpair.c \ opensolaris_nvpair_alloc_fixed.c WARNS?= 1 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem # This library uses macros to define fprintf behavior for several object types # The compiler will see the non-string literal arguments to the fprintf calls and # omit warnings for them. Quiesce these warnings in contrib code: # # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format # string is not a string literal (potentially insecure) [-Wformat-security] # ARENDER(pctl, nvlist_array, nvl, name, val, nelem); # CFLAGS+= -Wno-format-security .include Index: head/cddl/lib/libumem/Makefile =================================================================== --- head/cddl/lib/libumem/Makefile (revision 351849) +++ head/cddl/lib/libumem/Makefile (revision 351850) @@ -1,10 +1,11 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem +PACKAGE= runtime LIB= umem SRCS= umem.c WARNS?= 3 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem .include Index: head/cddl/lib/libuutil/Makefile =================================================================== --- head/cddl/lib/libuutil/Makefile (revision 351849) +++ head/cddl/lib/libuutil/Makefile (revision 351850) @@ -1,26 +1,27 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl +PACKAGE= runtime LIB= uutil SRCS= avl.c \ uu_alloc.c \ uu_avl.c \ uu_dprintf.c \ uu_ident.c \ uu_list.c \ uu_misc.c \ uu_open.c \ uu_pname.c \ uu_strtoint.c WARNS?= 1 CFLAGS+= -DNATIVE_BUILD CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head .include Index: head/cddl/lib/libzfs/Makefile =================================================================== --- head/cddl/lib/libzfs/Makefile (revision 351849) +++ head/cddl/lib/libzfs/Makefile (revision 351850) @@ -1,61 +1,62 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/compat/opensolaris/misc .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils/common +PACKAGE= runtime LIB= zfs LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core SRCS= deviceid.c \ fsshare.c \ mkdirp.c \ mnttab.c \ thread_pool.c \ zmount.c \ zone.c SRCS+= nicenum.c SRCS+= libzfs_changelist.c \ libzfs_compat.c \ libzfs_config.c \ libzfs_dataset.c \ libzfs_diff.c \ libzfs_import.c \ libzfs_iter.c \ libzfs_mount.c \ libzfs_pool.c \ libzfs_sendrecv.c \ libzfs_status.c \ libzfs_util.c \ zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ zfs_namecheck.c \ zfs_prop.c \ zpool_prop.c \ zprop_common.c \ WARNS?= 0 SHLIB_MAJOR= 3 CSTD= c99 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${SRCTOP}/sbin/mount CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libcmdutils .include Index: head/cddl/lib/libzfs_core/Makefile =================================================================== --- head/cddl/lib/libzfs_core/Makefile (revision 351849) +++ head/cddl/lib/libzfs_core/Makefile (revision 351850) @@ -1,36 +1,37 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/compat/opensolaris/misc .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs_core LIBADD= nvpair +PACKAGE= runtime INCS= libzfs_core.h SRCS= libzfs_core.c \ libzfs_core_compat.c \ zfs_ioctl_compat.c SRCS+= libzfs_compat.c WARNS?= 0 CSTD= c99 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${SRCTOP}/sbin/mount CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common .include Index: head/cddl/sbin/zfs/Makefile =================================================================== --- head/cddl/sbin/zfs/Makefile (revision 351849) +++ head/cddl/sbin/zfs/Makefile (revision 351850) @@ -1,26 +1,27 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs +PACKAGE= runtime PROG= zfs MAN= zfs.8 zfs-program.8 SRCS= zfs_main.c zfs_iter.c WARNS?= 0 CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs LIBADD= jail nvpair uutil zfs_core zfs .include Index: head/cddl/sbin/zpool/Makefile =================================================================== --- head/cddl/sbin/zpool/Makefile (revision 351849) +++ head/cddl/sbin/zpool/Makefile (revision 351850) @@ -1,31 +1,32 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs +PACKAGE= runtime PROG= zpool MAN= zpool.8 zpool-features.7 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c SRCS+= timestamp.c WARNS?= 0 CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common LIBADD= geom nvpair uutil zfs .include