Author: marius
Date: Sat Aug  5 12:33:00 2017
New Revision: 322094
URL: https://svnweb.freebsd.org/changeset/base/322094

Log:
  MFC: r306375
  
  Add a WITHOUT_DIALOG src.conf(5) knob.
  
  It also turns off dependencies (bsdinstall, bsdconfig, dpv, tzsetup).

Added:
  stable/10/tools/build/options/WITHOUT_DIALOG
     - copied unchanged from r306375, head/tools/build/options/WITHOUT_DIALOG
Modified:
  stable/10/Makefile.inc1
  stable/10/gnu/usr.bin/Makefile
  stable/10/lib/Makefile
  stable/10/share/mk/bsd.own.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/Makefile
  stable/10/usr.sbin/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1     Sat Aug  5 10:03:47 2017        (r322093)
+++ stable/10/Makefile.inc1     Sat Aug  5 12:33:00 2017        (r322094)
@@ -1713,13 +1713,17 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
                ${_cddl_lib_libzfs_core} \
                lib/libutil ${_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++
 gnu/lib/libstdc++__L: lib/msun__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
@@ -1850,8 +1854,6 @@ _lib_libypclnt=   lib/libypclnt
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
-
-gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE

Modified: stable/10/gnu/usr.bin/Makefile
==============================================================================
--- stable/10/gnu/usr.bin/Makefile      Sat Aug  5 10:03:47 2017        
(r322093)
+++ stable/10/gnu/usr.bin/Makefile      Sat Aug  5 12:33:00 2017        
(r322094)
@@ -4,7 +4,7 @@
 
 SUBDIR= ${_binutils} \
        ${_cc} \
-       dialog \
+       ${_dialog} \
        diff \
        diff3 \
        ${_dtc} \
@@ -24,6 +24,10 @@ _gperf=              gperf
 .if ${MK_GROFF} != "no"
 _groff=                groff
 .endif
+.endif
+
+.if ${MK_DIALOG} != "no"
+_dialog=       dialog
 .endif
 
 .if ${MK_GPL_DTC} != "no"

Modified: stable/10/lib/Makefile
==============================================================================
--- stable/10/lib/Makefile      Sat Aug  5 10:03:47 2017        (r322093)
+++ stable/10/lib/Makefile      Sat Aug  5 12:33:00 2017        (r322094)
@@ -40,7 +40,7 @@ SUBDIR=       ${SUBDIR_ORDERED} \
        libdevctl \
        libdevinfo \
        libdevstat \
-       libdpv \
+       ${_libdpv} \
        libdwarf \
        libedit \
        ${_libefi} \
@@ -162,6 +162,10 @@ _libbsnmp= libbsnmp
 
 .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
 _clang=                clang
+.endif
+
+.if ${MK_DIALOG} != "no"
+_libdpv=       libdpv
 .endif
 
 .if ${MK_FILE} != "no"

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk       Sat Aug  5 10:03:47 2017        
(r322093)
+++ stable/10/share/mk/bsd.own.mk       Sat Aug  5 12:33:00 2017        
(r322094)
@@ -288,6 +288,7 @@ __DEFAULT_YES_OPTIONS = \
     CRYPT \
     CTM \
     CXX \
+    DIALOG \
     DICT \
     DYNAMICROOT \
     ED_CRYPTO \
@@ -549,6 +550,10 @@ MK_KERBEROS:=      no
 .if ${MK_CXX} == "no"
 MK_CLANG:=     no
 MK_GROFF:=     no
+.endif
+
+.if ${MK_DIALOG} == "no"
+MK_BSDINSTALL:=        no
 .endif
 
 .if ${MK_MAIL} == "no"

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 10:03:47 
2017        (r322093)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc  Sat Aug  5 12:33:00 
2017        (r322094)
@@ -1057,6 +1057,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

Copied: stable/10/tools/build/options/WITHOUT_DIALOG (from r306375, 
head/tools/build/options/WITHOUT_DIALOG)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_DIALOG        Sat Aug  5 12:33:00 
2017        (r322094, copy of r306375, head/tools/build/options/WITHOUT_DIALOG)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build dialog(1), dialog(1,3), and dpv(1,3).

Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile  Sat Aug  5 10:03:47 2017        (r322093)
+++ stable/10/usr.bin/Makefile  Sat Aug  5 12:33:00 2017        (r322094)
@@ -37,7 +37,7 @@ SUBDIR=       alias \
        ctlstat \
        cut \
        dirname \
-       dpv \
+       ${_dpv} \
        du \
        elf2aout \
        elfdump \
@@ -225,6 +225,10 @@ SUBDIR+=   calendar
 
 .if ${MK_CLANG} != "no"
 _clang=                clang
+.endif
+
+.if ${MK_DIALOG} != "no"
+_dpv=          dpv
 .endif
 
 .if ${MK_EE} != "no"

Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile Sat Aug  5 10:03:47 2017        (r322093)
+++ stable/10/usr.sbin/Makefile Sat Aug  5 12:33:00 2017        (r322094)
@@ -6,7 +6,7 @@
 SUBDIR=        adduser \
        arp \
        binmiscctl \
-       bsdconfig \
+       ${_bsdconfig} \
        camdd \
        cdcontrol \
        chkgrp \
@@ -89,7 +89,7 @@ SUBDIR=       adduser \
        tcpdump \
        traceroute \
        trpt \
-       tzsetup \
+       ${_tzsetup} \
        uefisign \
        ugidfw \
        vigr \
@@ -150,6 +150,11 @@ SUBDIR+=   ctm
 
 .if ${MK_CXGBETOOL} != "no"
 SUBDIR+=       cxgbetool
+.endif
+
+.if ${MK_DIALOG} != "no"
+_bsdconfig=    bsdconfig
+_tzsetup=      tzsetup
 .endif
 
 .if ${MK_FLOPPY} != "no"
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to