aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2018-08-11 22:45:39 +0000
committerKyle Evans <kevans@FreeBSD.org>2018-08-11 22:45:39 +0000
commit35d2028fb8f70939026cc33c12280a4db8f90deb (patch)
treed38477bb9d5aaa94778e56684d812b0c08eb1bda
parentefa70a56148de6b1e4062540d23e1a6323b4f94f (diff)
downloadsrc-35d2028fb8f70939026cc33c12280a4db8f90deb.tar.gz
src-35d2028fb8f70939026cc33c12280a4db8f90deb.zip
libbe(3)/bectl(8): More SYSROOT/GCC build fixes
- Missing include path - Fully specify libzfs's dependencies (except for deps pulled in by other deps) in Makefile.inc1 - Drop WARNS back down to 2 for libbe(3). I do this with much hesitation, but the libzfs headers are apparently a hot warning-filled mess as far as GCC 4.2 is concerned.
Notes
Notes: svn path=/projects/bectl/; revision=337662
-rw-r--r--Makefile.inc16
-rw-r--r--cddl/lib/libbe/Makefile2
-rw-r--r--sbin/bectl/Makefile1
3 files changed, 9 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 44f932628d3a..50774edeafef 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2598,7 +2598,13 @@ _cddl_lib_libuutil= cddl/lib/libuutil
.if ${MK_ZFS} != "no"
_cddl_lib_libzfs_core= cddl/lib/libzfs_core
_cddl_lib_libzfs= cddl/lib/libzfs
+
cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
+
+cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__L lib/libutil__L
+cddl/lib/libzfs__L: lib/libthr__L lib/libmd__L lib/libz__L cddl/lib/libumem__L
+cddl/lib/libzfs__L: cddl/lib/libuutil__L cddl/lib/libavl__L lib/libgeom__L
+
cddl/lib/libbe__L: cddl/lib/libzfs__L
.endif
_cddl_lib_libctf= cddl/lib/libctf
diff --git a/cddl/lib/libbe/Makefile b/cddl/lib/libbe/Makefile
index c71d59eaa334..7d2facc6d282 100644
--- a/cddl/lib/libbe/Makefile
+++ b/cddl/lib/libbe/Makefile
@@ -11,6 +11,8 @@ SRCS= be.c be_access.c be_error.c be_info.c
INCS= be.h
MAN= libbe.3
+WARNS?= 2
+
LIBADD+= zfs
LIBADD+= nvpair
diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile
index 0014f9642611..5435eb14a0a9 100644
--- a/sbin/bectl/Makefile
+++ b/sbin/bectl/Makefile
@@ -13,6 +13,7 @@ LIBADD+= util
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
CFLAGS+= -DNEED_SOLARIS_BOOLEAN