svn commit: r306375 - in head: . gnu/usr.bin lib share/mk tools/build/mk tools/build/options usr.bin usr.sbin

Ed Maste emaste at FreeBSD.org
Tue Sep 27 18:08:40 UTC 2016 

Author: emaste
Date: Tue Sep 27 18:08:38 2016
New Revision: 306375
URL: https://svnweb.freebsd.org/changeset/base/306375

Log:
  Add a WITHOUT_DIALOG src.conf(5) knob
  
  It also turns off dependencies (bsdinstall, bsdconfig, dpv, tzsetup).
  
  Reviewed by:	dteske
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D7969

Added:
  head/tools/build/options/WITHOUT_DIALOG   (contents, props changed)
Modified:
  head/Makefile.inc1
  head/gnu/usr.bin/Makefile
  head/lib/Makefile
  head/share/mk/src.opts.mk
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile
  head/usr.sbin/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/Makefile.inc1	Tue Sep 27 18:08:38 2016	(r306375)
@@ -2032,8 +2032,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_cddl_lib_libctf} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
-		${_secure_lib_libssh} ${_secure_lib_libssl} \
-		gnu/lib/libdialog
+		${_secure_lib_libssh} ${_secure_lib_libssl}
 
 .if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
@@ -2041,6 +2040,11 @@ gnu/lib/libstdc++__L: lib/msun__L
 gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
+.if ${MK_DIALOG} != "no"
+_prebuild_libs+= gnu/lib/libdialog
+gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
+.endif
+
 .if ${MK_LIBCPLUSPLUS} != "no"
 _prebuild_libs+= lib/libc++
 .endif
@@ -2190,8 +2194,6 @@ lib/libproc__L: gnu/lib/libsupc++__L
 .endif
 .endif
 
-gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
-
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/gnu/usr.bin/Makefile	Tue Sep 27 18:08:38 2016	(r306375)
@@ -4,7 +4,6 @@
 
 SUBDIR= ${_binutils} \
 	${_cc} \
-	dialog \
 	diff \
 	diff3 \
 	${_dtc} \
@@ -49,6 +48,8 @@ _gdb=		gdb
 _cc=		cc
 .endif
 
+SUBDIR.${MK_DIALOG}+=	dialog
+
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/lib/Makefile	Tue Sep 27 18:08:38 2016	(r306375)
@@ -46,7 +46,6 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	${_libdevdctl} \
 	libdevinfo \
 	libdevstat \
-	libdpv \
 	libdwarf \
 	libedit \
 	${_libelftc} \
@@ -197,6 +196,8 @@ _libelftc=	libelftc
 _libpe=		libpe
 .endif
 
+SUBDIR.${MK_DIALOG}+=	libdpv
+
 .if ${MK_FILE} != "no"
 _libmagic=	libmagic
 .endif

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/share/mk/src.opts.mk	Tue Sep 27 18:08:38 2016	(r306375)
@@ -76,6 +76,7 @@ __DEFAULT_YES_OPTIONS = \
     CTM \
     CUSE \
     CXX \
+    DIALOG \
     DICT \
     DMAGENT \
     DYNAMICROOT \
@@ -328,6 +329,10 @@ MK_GNUCXX:=	no
 MK_TESTS:=	no
 .endif
 
+.if ${MK_DIALOG} == "no"
+MK_BSDINSTALL:=	no
+.endif
+
 .if ${MK_MAIL} == "no"
 MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Tue Sep 27 18:08:38 2016	(r306375)
@@ -1340,6 +1340,27 @@ OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
+.if ${MK_DIALOG} == no
+OLD_FILES+=usr/bin/dialog
+OLD_FILES+=usr/bin/dpv
+OLD_FILES+=usr/lib/libdialog.a
+OLD_FILES+=usr/lib/libdialog.so
+OLD_FILES+=usr/lib/libdialog.so.8
+OLD_FILES+=usr/lib/libdialog_p.a
+OLD_FILES+=usr/lib/libdpv.a
+OLD_FILES+=usr/lib/libdpv.so
+OLD_FILES+=usr/lib/libdpv.so.1
+OLD_FILES+=usr/lib/libdpv_p.a
+OLD_FILES+=usr/sbin/bsdconfig
+OLD_FILES+=usr/sbin/tzsetup
+OLD_FILES+=usr/share/man/man1/dialog.1.gz
+OLD_FILES+=usr/share/man/man1/dpv.1.gz
+OLD_FILES+=usr/share/man/man3/dialog.3.gz
+OLD_FILES+=usr/share/man/man3/dpv.3.gz
+OLD_FILES+=usr/share/man/man8/tzsetup.8.gz
+OLD_FILES+=usr/share/man/man8/bsdconfig.8.gz
+.endif
+
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz

Added: head/tools/build/options/WITHOUT_DIALOG
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_DIALOG	Tue Sep 27 18:08:38 2016	(r306375)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build dialog(1), dialog(1,3), and dpv(1,3).

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/usr.bin/Makefile	Tue Sep 27 18:08:38 2016	(r306375)
@@ -36,7 +36,6 @@ SUBDIR=	alias \
 	ctlstat \
 	cut \
 	dirname \
-	dpv \
 	du \
 	elf2aout \
 	elfdump \
@@ -200,6 +199,7 @@ SUBDIR.${MK_BLUETOOTH}+=	bluetooth
 SUBDIR.${MK_BSD_CPIO}+=	cpio
 SUBDIR.${MK_CALENDAR}+=	calendar
 SUBDIR.${MK_CLANG}+=	clang
+SUBDIR.${MK_DIALOG}+=	dpv
 SUBDIR.${MK_EE}+=	ee
 SUBDIR.${MK_FILE}+=	file
 SUBDIR.${MK_FINGER}+=	finger

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Tue Sep 27 18:07:22 2016	(r306374)
+++ head/usr.sbin/Makefile	Tue Sep 27 18:08:38 2016	(r306375)
@@ -6,7 +6,6 @@
 SUBDIR=	adduser \
 	arp \
 	binmiscctl \
-	bsdconfig \
 	camdd \
 	cdcontrol \
 	chkgrp \
@@ -89,7 +88,6 @@ SUBDIR=	adduser \
 	tcpdump \
 	traceroute \
 	trpt \
-	tzsetup \
 	uefisign \
 	ugidfw \
 	vigr \
@@ -123,6 +121,8 @@ SUBDIR.${MK_BOOTPARAMD}+=	bootparamd
 SUBDIR.${MK_BSDINSTALL}+=	bsdinstall
 SUBDIR.${MK_BSNMP}+=	bsnmpd
 SUBDIR.${MK_CTM}+=	ctm
+SUBDIR.${MK_DIALOG}+=	tzsetup
+SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread

More information about the svn-src-all mailing list