Attachment #229765 for bug #260094

View | Details | Raw Unified | Return to bug 260094
Collapse All | Expand All




.endif
.endif

.if ${MK_ZFS} != "no"
SUBDIR_DEPEND_libavl=		libspl
.endif
SUBDIR_DEPEND_libctf=		libspl
SUBDIR_DEPEND_libdtrace=	libctf
.if ${MK_ZFS} != "no"
SUBDIR_DEPEND_libnvpair=	libspl
.endif
SUBDIR_DEPEND_libtpool=		libspl
SUBDIR_DEPEND_libuutil=		libavl libspl
SUBDIR_DEPEND_libzfs_core=	libnvpair libspl libzutil

Lines 1-10 Link Here

(-)cddl/lib/libavl/Makefile (+4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
		3	.include <src.opts.mk>
		4
3	.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl	5	.PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
4		6
5	PACKAGE= runtime	7	PACKAGE= runtime
6	LIB= avl	8	LIB= avl
		9	.if ${MK_ZFS} != "no"
7	LIBADD= spl	10	LIBADD= spl
		11	.endif
8	SRCS= avl.c	12	SRCS= avl.c
9	WARNS?= 3	13	WARNS?= 3
10	CFLAGS+= -DIN_BASE	14	CFLAGS+= -DIN_BASE

Lines 1-10 Link Here

(-)cddl/lib/libnvpair/Makefile (+4 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
		3	.include <src.opts.mk>
		4
3	.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair	5	.PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
4	.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair	6	.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
5		7
6	LIB= nvpair	8	LIB= nvpair
		9	.if ${MK_ZFS} != "no"
7	LIBADD= spl	10	LIBADD= spl
		11	.endif
8		12
9	PACKAGE= runtime	13	PACKAGE= runtime
10	# user	14	# user




_DP_80211=	sbuf bsdxml
_DP_9p=		sbuf
_DP_archive=	z bz2 lzma bsdxml zstd
.if ${MK_ZFS} != "no"
_DP_avl=	spl
.endif
_DP_zstd=	pthread
.if ${MK_BLACKLIST} != "no"
_DP_blacklist+=	pthread

_DP_stdthreads=	pthread
_DP_tacplus=	md
_DP_ncursesw=	tinfow
.if ${MK_ZFS} != "no"
_DP_nvpair=	spl
.endif
_DP_panelw=	ncursesw
_DP_rpcsec_gss=	gssapi
_DP_smb=	kiconv

Return to bug 260094

Lines 36-45 Link Here

(-)cddl/lib/Makefile (+4 lines)
36	.endif	36	.endif
37	.endif	37	.endif
38		38
		39	.if ${MK_ZFS} != "no"
39	SUBDIR_DEPEND_libavl= libspl	40	SUBDIR_DEPEND_libavl= libspl
		41	.endif
40	SUBDIR_DEPEND_libctf= libspl	42	SUBDIR_DEPEND_libctf= libspl
41	SUBDIR_DEPEND_libdtrace= libctf	43	SUBDIR_DEPEND_libdtrace= libctf
		44	.if ${MK_ZFS} != "no"
42	SUBDIR_DEPEND_libnvpair= libspl	45	SUBDIR_DEPEND_libnvpair= libspl
		46	.endif
43	SUBDIR_DEPEND_libtpool= libspl	47	SUBDIR_DEPEND_libtpool= libspl
44	SUBDIR_DEPEND_libuutil= libavl libspl	48	SUBDIR_DEPEND_libuutil= libavl libspl
45	SUBDIR_DEPEND_libzfs_core= libnvpair libspl libzutil	49	SUBDIR_DEPEND_libzfs_core= libnvpair libspl libzutil

Lines 260-266 Link Here

(-)share/mk/src.libnames.mk (+4 lines)
260	_DP_80211= sbuf bsdxml	260	_DP_80211= sbuf bsdxml
261	_DP_9p= sbuf	261	_DP_9p= sbuf
262	_DP_archive= z bz2 lzma bsdxml zstd	262	_DP_archive= z bz2 lzma bsdxml zstd
		263	.if ${MK_ZFS} != "no"
263	_DP_avl= spl	264	_DP_avl= spl
		265	.endif
264	_DP_zstd= pthread	266	_DP_zstd= pthread
265	.if ${MK_BLACKLIST} != "no"	267	.if ${MK_BLACKLIST} != "no"
266	_DP_blacklist+= pthread	268	_DP_blacklist+= pthread
Lines 381-387 Link Here
381	_DP_stdthreads= pthread	383	_DP_stdthreads= pthread
382	_DP_tacplus= md	384	_DP_tacplus= md
383	_DP_ncursesw= tinfow	385	_DP_ncursesw= tinfow
		386	.if ${MK_ZFS} != "no"
384	_DP_nvpair= spl	387	_DP_nvpair= spl
		388	.endif
385	_DP_panelw= ncursesw	389	_DP_panelw= ncursesw
386	_DP_rpcsec_gss= gssapi	390	_DP_rpcsec_gss= gssapi
387	_DP_smb= kiconv	391	_DP_smb= kiconv