svn commit: r337995 - in head: . cddl/lib cddl/lib/libbe lib lib/libbe share/mk

[Kyle Evans]

Author: kevans
Date: Sat Aug 18 03:20:59 2018
New Revision: 337995
URL: https://svnweb.freebsd.org/changeset/base/337995

Log:
  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.

Added:
  head/lib/libbe/Makefile
     - copied, changed from r337994, head/cddl/lib/libbe/Makefile
Deleted:
  head/cddl/lib/libbe/
Modified:
  head/Makefile.inc1
  head/cddl/lib/Makefile
  head/lib/Makefile
  head/share/mk/src.libnames.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Aug 18 03:08:54 2018	(r337994)
+++ head/Makefile.inc1	Sat Aug 18 03:20:59 2018	(r337995)
@@ -2605,7 +2605,7 @@ cddl/lib/libzfs__L: cddl/lib/libzfs_core__L lib/msun__
 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
+lib/libbe__L: cddl/lib/libzfs__L
 .endif
 _cddl_lib_libctf= cddl/lib/libctf
 _cddl_lib= cddl/lib

Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile	Sat Aug 18 03:08:54 2018	(r337994)
+++ head/cddl/lib/Makefile	Sat Aug 18 03:20:59 2018	(r337995)
@@ -4,7 +4,6 @@
 
 SUBDIR=	${_drti} \
 	libavl \
-	${_libbe} \
 	libctf \
 	${_libdtrace} \
 	libnvpair \
@@ -17,7 +16,6 @@ SUBDIR=	${_drti} \
 SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
-_libbe=		libbe
 _libzfs_core=	libzfs_core
 _libzfs=	libzfs
 .if ${MK_LIBTHR} != "no"
@@ -30,7 +28,6 @@ _drti=		drti
 _libdtrace=	libdtrace
 .endif
 
-SUBDIR_DEPEND_libbe=	libnvpair libzfs
 SUBDIR_DEPEND_libdtrace=	libctf
 SUBDIR_DEPEND_libzfs_core=	libnvpair
 SUBDIR_DEPEND_libzfs=	libavl libnvpair libumem libuutil libzfs_core

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Sat Aug 18 03:08:54 2018	(r337994)
+++ head/lib/Makefile	Sat Aug 18 03:20:59 2018	(r337995)
@@ -209,6 +209,7 @@ SUBDIR.${MK_TESTS}+=	tests
 SUBDIR.${MK_UNBOUND}+=	libunbound
 SUBDIR.${MK_USB}+=	libusbhid libusb
 SUBDIR.${MK_OFED}+=	ofed
+SUBDIR.${MK_ZFS}+=	libbe
 
 .if !make(install)
 SUBDIR_PARALLEL=

Copied and modified: head/lib/libbe/Makefile (from r337994, head/cddl/lib/libbe/Makefile)
==============================================================================
--- head/cddl/lib/libbe/Makefile	Sat Aug 18 03:08:54 2018	(r337994, copy source)
+++ head/lib/libbe/Makefile	Sat Aug 18 03:20:59 2018	(r337995)
@@ -4,19 +4,17 @@ PACKAGE=	lib${LIB}
 LIB=		be
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
-LIBBE_SRC=	${SRCTOP}/lib/libbe
 
-.PATH:	${LIBBE_SRC}
 SRCS=		be.c be_access.c be_error.c be_info.c
 INCS=		be.h
 MAN=		libbe.3
 
 WARNS?=	2
+IGNORE_PRAGMA=	yes
 
 LIBADD+= zfs
 LIBADD+= nvpair
 
-CFLAGS+= -I${LIBBE_SRC}
 CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Sat Aug 18 03:08:54 2018	(r337994)
+++ head/share/mk/src.libnames.mk	Sat Aug 18 03:20:59 2018	(r337995)
@@ -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
 # Makefile.depend.  These are sorted by directory.
 LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
-LIBBEDIR=	${OBJTOP}/cddl/lib/libbe
 LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
 LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
 LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair