Author: kevans
Date: Mon Aug 13 03:38:32 2018
New Revision: 337696
URL: https://svnweb.freebsd.org/changeset/base/337696
Log:
Use INCS for non-sys/ libnvpair and libzfs_core includes
While nothing was wrong with libnvpair.h, libzfs_core.h was only guarded by
MK_CDDL rather than MK_CDDL && MK_ZFS. Rather than ugl'if'ying
include/Makefile to impose the extra restriction, just move the non-sys/
includes into INCS with the respect lib builds.
This has the added bonus of allowing third party packagers to try and split
these libs out of the FreeBSD-runtime package, if they are so inclined.
The sys/ include was left alone- generally userland libraries shouldn't
install kernel headers.
MFC after: 1 week
Modified:
head/cddl/lib/libnvpair/Makefile
head/cddl/lib/libzfs_core/Makefile
head/include/Makefile
Modified: head/cddl/lib/libnvpair/Makefile
==============================================================================
--- head/cddl/lib/libnvpair/Makefile Sun Aug 12 22:07:13 2018
(r337695)
+++ head/cddl/lib/libnvpair/Makefile Mon Aug 13 03:38:32 2018
(r337696)
@@ -5,6 +5,7 @@
LIB= nvpair
+INCS= libnvpair.h
SRCS= libnvpair.c \
nvpair_alloc_system.c \
nvpair_json.c \
Modified: head/cddl/lib/libzfs_core/Makefile
==============================================================================
--- head/cddl/lib/libzfs_core/Makefile Sun Aug 12 22:07:13 2018
(r337695)
+++ head/cddl/lib/libzfs_core/Makefile Mon Aug 13 03:38:32 2018
(r337696)
@@ -9,6 +9,7 @@
LIB= zfs_core
LIBADD= nvpair
+INCS= libzfs_core.h
SRCS= libzfs_core.c \
libzfs_core_compat.c \
zfs_ioctl_compat.c
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Sun Aug 12 22:07:13 2018 (r337695)
+++ head/include/Makefile Mon Aug 13 03:38:32 2018 (r337696)
@@ -246,12 +246,6 @@ copies: .PHONY .META
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${SDESTDIR}${INCLUDEDIR}/teken
.if ${MK_CDDL} != "no"
- cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common; \
- ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444
libzfs_core.h \
- ${SDESTDIR}${INCLUDEDIR}
- cd ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair; \
- ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
- ${SDESTDIR}${INCLUDEDIR}
cd ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
${SDESTDIR}${INCLUDEDIR}/sys
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
