svn commit: r277663 - in head: share/mk tools/build/mk tools/build/options usr.bin
Garrett Cooper
ngie at FreeBSD.org
Sun Jan 25 00:03:47 UTC 2015
Author: ngie
Date: Sun Jan 25 00:03:44 2015
New Revision: 277663
URL: https://svnweb.freebsd.org/changeset/base/277663
Log:
Add MK_EE knob to control installing edit, ee, etc
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_EE (contents, props changed)
Modified:
head/share/mk/src.opts.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Sat Jan 24 21:25:55 2015 (r277662)
+++ head/share/mk/src.opts.mk Sun Jan 25 00:03:44 2015 (r277663)
@@ -73,6 +73,7 @@ __DEFAULT_YES_OPTIONS = \
DMAGENT \
DYNAMICROOT \
ED_CRYPTO \
+ EE \
ELFTOOLCHAIN_TOOLS \
EXAMPLES \
FDT \
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jan 24 21:25:55 2015 (r277662)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 00:03:44 2015 (r277663)
@@ -1216,6 +1216,23 @@ OLD_FILES+=usr/share/dict/words
OLD_DIRS+=usr/share/dict
.endif
+.if ${MK_EE} == no
+OLD_FILES+=usr/bin/edit
+OLD_FILES+=usr/bin/ee
+OLD_FILES+=usr/bin/ree
+OLD_FILES+=usr/share/man/man1/edit.1.gz
+OLD_FILES+=usr/share/man/man1/ee.1.gz
+OLD_FILES+=usr/share/man/man1/ree.1.gz
+OLD_FILES+=usr/share/nls/C/ee.cat
+OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
+OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
+OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
+OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
+.endif
+
.if ${MK_ELFTOOLCHAIN_TOOLS} == no
OLD_FILES+=usr/bin/elfcopy
OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
Added: head/tools/build/options/WITHOUT_EE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_EE Sun Jan 25 00:03:44 2015 (r277663)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build and install
+.Xr edit 1 ,
+.Xr ee 1 ,
+and related programs.
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sat Jan 24 21:25:55 2015 (r277662)
+++ head/usr.bin/Makefile Sun Jan 25 00:03:44 2015 (r277663)
@@ -40,7 +40,6 @@ SUBDIR= ${_addr2line} \
dirname \
dpv \
du \
- ee \
elf2aout \
${_elfcopy} \
elfdump \
@@ -240,6 +239,10 @@ SUBDIR+= calendar
_clang= clang
.endif
+.if ${MK_EE} != "no"
+SUBDIR+= ee
+.endif
+
.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
_addr2line= addr2line
_elfcopy= elfcopy
More information about the svn-src-all
mailing list