Page MenuHomeFreeBSD
Differential D2045 Diff 5774 usr.sbin/fstyp/Makefile

Changeset View

Standalone View

View Options

usr.sbin/fstyp/Makefile

# $FreeBSD$ # $FreeBSD$
.include <src.opts.mk>
PROG= fstyp PROG= fstyp
SRCS= fstyp.c ext2fs.c cd9660.c msdosfs.c ntfs.c ufs.c SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c
.if ${MK_CDDL} != "no"
SRCS += zfs.c
.endif
MAN= fstyp.8 MAN= fstyp.8
WARNS= 6 WARNS= 6
.if ${MK_CDDL} != "no"
IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_CDDL
CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include
CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem
CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common
CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head
.endif
traszUnsubmitted
Done
Inline Actions

You might also need to take MK_CDDL (or MK_OPENSOLARIS, or what it was called) into account here; ie not build and link against the ZFS bits if it says not to.

trasz: You might also need to take MK_CDDL (or MK_OPENSOLARIS, or what it was called) into account…
eadlerUnsubmitted
Not Done
Inline Actions

LIBADD= geom md ...
this eliminates need for DPADD and LDADD I think

eadler: LIBADD= geom md ... this eliminates need for DPADD and LDADD I think
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

LIBADD doesn't seem to support nvpair or zfs yet. They are not defined in share/mk/src.libnames.mk and produce an error.

allanjude: LIBADD doesn't seem to support nvpair or zfs yet. They are not defined in share/mk/src.libnames.
traszUnsubmitted
Not Done
Inline Actions

I'd say the correct course of action then is to add those to src.libnames.mk, and use LIBADD. Or at least investigate why this hadn't been done - just an overlook, or some larger problem (ABI?).

trasz: I'd say the correct course of action then is to add those to src.libnames.mk, and use LIBADD.
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

This is well outside of my level of understanding of the build system. Do you know who I should ask for assistance?

allanjude: This is well outside of my level of understanding of the build system. Do you know who I should…
traszUnsubmitted
Not Done
Inline Actions

bapt@, I believe.

trasz: bapt@, I believe.
allanjudeAuthorUnsubmitted
Not Done
Inline Actions

<bapt> AllanJude: nothing cddl related has been converted to libadd
<bapt> and all libs there are a giant mess
<bapt> not easy to do
<bapt> for example libzfs_core depends on libzfs which depends on libzfs_core

So the suggestion seems to be to leave it as DPADD/LDADD for now.

allanjude: <bapt> AllanJude: nothing cddl related has been converted to libadd <bapt> and all libs there…
CFLAGS+=-I${.CURDIR}/../../sys
eadlerUnsubmitted
Done
Inline Actions

combine with CFLAGS above

eadler: combine with CFLAGS above
DPADD= ${LIBGEOM} ${LIBMD}
LDADD= -lgeom -lmd
.if ${MK_CDDL} != "no"
DPADD += ${LIBNVPAIR} ${LIBZFS}
LDADD += -lnvpair -lzfs
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>