d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use INCS for non-sys/ libnvpair and libzfs_core includes

Browse Source 
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
This commit is contained in:
Kyle Evans 2018-08-13 03:38:32 +00:00
parent 20a3cbe1f8
commit ce33c57d6c
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cddl/lib/libnvpair/Makefile
View File

@ -5,6 +5,7 @@
LIB= nvpair LIB= nvpair
INCS= libnvpair.h
SRCS= libnvpair.c \ SRCS= libnvpair.c \
nvpair_alloc_system.c \ nvpair_alloc_system.c \
nvpair_json.c \ nvpair_json.c \

1
cddl/lib/libzfs_core/Makefile
View File

@ -9,6 +9,7 @@
LIB= zfs_core LIB= zfs_core
LIBADD= nvpair LIBADD= nvpair
INCS= libzfs_core.h
SRCS= libzfs_core.c \ SRCS= libzfs_core.c \
libzfs_core_compat.c \ libzfs_core_compat.c \
zfs_ioctl_compat.c zfs_ioctl_compat.c

6
include/Makefile
View File

@ -246,12 +246,6 @@ copies: .PHONY .META
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
${SDESTDIR}${INCLUDEDIR}/teken ${SDESTDIR}${INCLUDEDIR}/teken
.if ${MK_CDDL} != "no" .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; \ cd ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys; \
${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
${SDESTDIR}${INCLUDEDIR}/sys ${SDESTDIR}${INCLUDEDIR}/sys