Date: Tue, 24 Jul 2018 15:42:23 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r336673 - in projects/bectl: cddl/lib cddl/lib/libbe lib/libbe share/mk Message-ID: <201807241542.w6OFgNVT005886@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Tue Jul 24 15:42:23 2018 New Revision: 336673 URL: https://svnweb.freebsd.org/changeset/base/336673 Log: libbe(3): Add to cddl build, adjust src.libnames.mk as needed Added: projects/bectl/cddl/lib/libbe/ projects/bectl/cddl/lib/libbe/Makefile - copied, changed from r336672, projects/bectl/lib/libbe/Makefile Deleted: projects/bectl/lib/libbe/Makefile Modified: projects/bectl/cddl/lib/Makefile projects/bectl/share/mk/src.libnames.mk Modified: projects/bectl/cddl/lib/Makefile ============================================================================== --- projects/bectl/cddl/lib/Makefile Tue Jul 24 14:55:47 2018 (r336672) +++ projects/bectl/cddl/lib/Makefile Tue Jul 24 15:42:23 2018 (r336673) @@ -4,6 +4,7 @@ SUBDIR= ${_drti} \ libavl \ + ${_libbe} \ libctf \ ${_libdtrace} \ libnvpair \ @@ -16,6 +17,7 @@ SUBDIR= ${_drti} \ SUBDIR.${MK_TESTS}+= tests .if ${MK_ZFS} != "no" +_libbe= libbe _libzfs_core= libzfs_core _libzfs= libzfs .if ${MK_LIBTHR} != "no" @@ -28,6 +30,7 @@ _drti= drti _libdtrace= libdtrace .endif +SUBDIR_DEPEND_libbe= libnvpair libzfs SUBDIR_DEPEND_libdtrace= libctf SUBDIR_DEPEND_libzfs_core= libnvpair SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core Copied and modified: projects/bectl/cddl/lib/libbe/Makefile (from r336672, projects/bectl/lib/libbe/Makefile) ============================================================================== --- projects/bectl/lib/libbe/Makefile Tue Jul 24 14:55:47 2018 (r336672, copy source) +++ projects/bectl/cddl/lib/libbe/Makefile Tue Jul 24 15:42:23 2018 (r336673) @@ -28,6 +28,9 @@ PACKAGE= lib${LIB} LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 +LIBBE_SRC= ${SRCTOP}/lib/libbe + +.PATH: ${LIBBE_SRC} SRCS= be.c be_access.c be_error.c be_info.c INCS= be.h MAN= libbe.3 @@ -37,7 +40,10 @@ WARNS?= 1 LIBADD+= zfs LIBADD+= nvpair +CFLAGS+= -I${LIBBE_SRC} +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem Modified: projects/bectl/share/mk/src.libnames.mk ============================================================================== --- projects/bectl/share/mk/src.libnames.mk Tue Jul 24 14:55:47 2018 (r336672) +++ projects/bectl/share/mk/src.libnames.mk Tue Jul 24 15:42:23 2018 (r336673) @@ -474,7 +474,6 @@ LIBBSNMPTOOLS?= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a LIBAMUDIR= ${OBJTOP}/usr.sbin/amd/libamu LIBAMU?= ${LIBAMUDIR}/libamu.a -LIBBEDIR= ${OBJTOP}/lib/libbe LIBBE?= ${LIBBEDIR}/libbe.a LIBPMCSTATDIR= ${OBJTOP}/lib/libpmcstat @@ -487,6 +486,7 @@ LIBC_NOSSP_PIC?= ${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a # not using a --sysroot or for meta mode bootstrapping when there is no # Makefile.depend. These are sorted by directory. LIBAVLDIR= ${OBJTOP}/cddl/lib/libavl +LIBBEDIR= ${OBJTOP}/cddl/lib/libbe LIBCTFDIR= ${OBJTOP}/cddl/lib/libctf LIBDTRACEDIR= ${OBJTOP}/cddl/lib/libdtrace LIBNVPAIRDIR= ${OBJTOP}/cddl/lib/libnvpair
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807241542.w6OFgNVT005886>