diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-30 07:28:27 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-30 07:28:27 +0000 |
| commit | d8f677d335aa48afa79c8e5827da4c308be9e648 (patch) | |
| tree | 224338088e9997844713927b1ad35176256d4117 /Makefile.inc1 | |
| parent | 2c4f7501e0865416b5e978f93a215a1707816f60 (diff) | |
| download | FreeBSD-src-d8f677d335aa48afa79c8e5827da4c308be9e648.zip FreeBSD-src-d8f677d335aa48afa79c8e5827da4c308be9e648.tar.gz | |
MFC r306375,r307802:
r306375 (by emaste):
Add a WITHOUT_DIALOG src.conf(5) knob
It also turns off dependencies (bsdinstall, bsdconfig, dpv, tzsetup).
r307802 (by bapt):
Fix build of tzsetup when WITHOUT_DIALOG is set
Hide dialog specific code behind HAVE_DIALOG. It allows to build a stripped
down version (missing the dialog UI) but perfectly function tzsetup when
world is built WITHOUT_DIALOG
Reorganise a bit the code to limit the number of blocks under HAVE_DIALOG
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 451becc..b777ced 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2049,8 +2049,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++ @@ -2058,6 +2057,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 @@ -2204,8 +2208,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}) |
