mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 04:43:53 +00:00
libbe(3): Move build goop back out of cddl/
Some background: in the GSoC project, libbe/Makefile lived in lib/libbe. I created projects/bectl branch, maintained the above for all of five minutes before I misread Makefile.inc1 and decided that it couldn't possibly build outside of cddl/, so I kicked the Makefile out into the cddl/ build and all was good. The misreading was of the bit where .WAIT is added to SUBDIR after lib, libexec but prior to building bin and cddl *only during the install targets*, which is the critical part. Fast forward- buildworld was still broken in my branch unbeknownst to me because I didn't nuke my OBJDIR. Combing through Makefile.inc1 eventually revealed the necessary magic to make sure that libbe's dependencies are specified well enough, and it becomes clear what needs done to make a non-cddl/ build work. This is an interesting prospect, because the build split is kind of annoying to work with. IGNORE_PRAGMA is added to avoid dropping WARNS by one more. This was previously pulled in via cddl/Makefile.inc.
This commit is contained in:
parent
f25a4e58ec
commit
7920ad944b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=337995
|
@ -2605,7 +2605,7 @@ 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: 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/libzfs__L: cddl/lib/libuutil__L cddl/lib/libavl__L lib/libgeom__L
|
||||||
|
|
||||||
cddl/lib/libbe__L: cddl/lib/libzfs__L
|
lib/libbe__L: cddl/lib/libzfs__L
|
||||||
.endif
|
.endif
|
||||||
_cddl_lib_libctf= cddl/lib/libctf
|
_cddl_lib_libctf= cddl/lib/libctf
|
||||||
_cddl_lib= cddl/lib
|
_cddl_lib= cddl/lib
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
SUBDIR= ${_drti} \
|
SUBDIR= ${_drti} \
|
||||||
libavl \
|
libavl \
|
||||||
${_libbe} \
|
|
||||||
libctf \
|
libctf \
|
||||||
${_libdtrace} \
|
${_libdtrace} \
|
||||||
libnvpair \
|
libnvpair \
|
||||||
|
@ -17,7 +16,6 @@ SUBDIR= ${_drti} \
|
||||||
SUBDIR.${MK_TESTS}+= tests
|
SUBDIR.${MK_TESTS}+= tests
|
||||||
|
|
||||||
.if ${MK_ZFS} != "no"
|
.if ${MK_ZFS} != "no"
|
||||||
_libbe= libbe
|
|
||||||
_libzfs_core= libzfs_core
|
_libzfs_core= libzfs_core
|
||||||
_libzfs= libzfs
|
_libzfs= libzfs
|
||||||
.if ${MK_LIBTHR} != "no"
|
.if ${MK_LIBTHR} != "no"
|
||||||
|
@ -30,7 +28,6 @@ _drti= drti
|
||||||
_libdtrace= libdtrace
|
_libdtrace= libdtrace
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
SUBDIR_DEPEND_libbe= libnvpair libzfs
|
|
||||||
SUBDIR_DEPEND_libdtrace= libctf
|
SUBDIR_DEPEND_libdtrace= libctf
|
||||||
SUBDIR_DEPEND_libzfs_core= libnvpair
|
SUBDIR_DEPEND_libzfs_core= libnvpair
|
||||||
SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core
|
SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core
|
||||||
|
|
|
@ -209,6 +209,7 @@ SUBDIR.${MK_TESTS}+= tests
|
||||||
SUBDIR.${MK_UNBOUND}+= libunbound
|
SUBDIR.${MK_UNBOUND}+= libunbound
|
||||||
SUBDIR.${MK_USB}+= libusbhid libusb
|
SUBDIR.${MK_USB}+= libusbhid libusb
|
||||||
SUBDIR.${MK_OFED}+= ofed
|
SUBDIR.${MK_OFED}+= ofed
|
||||||
|
SUBDIR.${MK_ZFS}+= libbe
|
||||||
|
|
||||||
.if !make(install)
|
.if !make(install)
|
||||||
SUBDIR_PARALLEL=
|
SUBDIR_PARALLEL=
|
||||||
|
|
|
@ -4,19 +4,17 @@ PACKAGE= lib${LIB}
|
||||||
LIB= be
|
LIB= be
|
||||||
SHLIB_MAJOR= 1
|
SHLIB_MAJOR= 1
|
||||||
SHLIB_MINOR= 0
|
SHLIB_MINOR= 0
|
||||||
LIBBE_SRC= ${SRCTOP}/lib/libbe
|
|
||||||
|
|
||||||
.PATH: ${LIBBE_SRC}
|
|
||||||
SRCS= be.c be_access.c be_error.c be_info.c
|
SRCS= be.c be_access.c be_error.c be_info.c
|
||||||
INCS= be.h
|
INCS= be.h
|
||||||
MAN= libbe.3
|
MAN= libbe.3
|
||||||
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
IGNORE_PRAGMA= yes
|
||||||
|
|
||||||
LIBADD+= zfs
|
LIBADD+= zfs
|
||||||
LIBADD+= nvpair
|
LIBADD+= nvpair
|
||||||
|
|
||||||
CFLAGS+= -I${LIBBE_SRC}
|
|
||||||
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
|
CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
|
||||||
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
|
CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
|
||||||
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
|
CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
|
|
@ -486,7 +486,6 @@ LIBC_NOSSP_PIC?= ${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a
|
||||||
# not using a --sysroot or for meta mode bootstrapping when there is no
|
# not using a --sysroot or for meta mode bootstrapping when there is no
|
||||||
# Makefile.depend. These are sorted by directory.
|
# Makefile.depend. These are sorted by directory.
|
||||||
LIBAVLDIR= ${OBJTOP}/cddl/lib/libavl
|
LIBAVLDIR= ${OBJTOP}/cddl/lib/libavl
|
||||||
LIBBEDIR= ${OBJTOP}/cddl/lib/libbe
|
|
||||||
LIBCTFDIR= ${OBJTOP}/cddl/lib/libctf
|
LIBCTFDIR= ${OBJTOP}/cddl/lib/libctf
|
||||||
LIBDTRACEDIR= ${OBJTOP}/cddl/lib/libdtrace
|
LIBDTRACEDIR= ${OBJTOP}/cddl/lib/libdtrace
|
||||||
LIBNVPAIRDIR= ${OBJTOP}/cddl/lib/libnvpair
|
LIBNVPAIRDIR= ${OBJTOP}/cddl/lib/libnvpair
|
||||||
|
|
Loading…
Reference in a new issue