svn commit: r282549 - in head: . tools/build/mk

[Ed Maste]

Author: emaste
Date: Wed May  6 15:20:50 2015
New Revision: 282549
URL: https://svnweb.freebsd.org/changeset/base/282549

Log:
  Fix make delete-old for gperf and GCC/CXX options
  
  - Optional components go in OptionalObsoleteFiles
  - Move gperf removal to be based on MK_GCC only, not MK_CXX and MK_GCC
  
  Reviewed by:	imp, sbruno
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D2421

Modified:
  head/ObsoleteFiles.inc
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed May  6 15:20:29 2015	(r282548)
+++ head/ObsoleteFiles.inc	Wed May  6 15:20:50 2015	(r282549)
@@ -430,10 +430,6 @@ OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
-.if ${MK_GCC} == "no"
-# 20141009: gperf disabled by default
-OLD_FILES+=usr/bin/gperf
-.endif
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed May  6 15:20:29 2015	(r282548)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed May  6 15:20:50 2015	(r282549)
@@ -1009,12 +1009,6 @@ OLD_FILES+=usr/bin/c++filt
 .endif
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
-.if ${MK_GCC} == no
-OLD_FILES+=usr/bin/gperf
-OLD_FILES+=usr/share/info/gperf.info.gz
-OLD_FILES+=usr/share/man/man1/gperf.1.gz
-OLD_FILES+=usr/share/man/man1/gperf.7.gz
-.endif
 .endif
 
 .if ${MK_FMTREE} == no
@@ -1729,6 +1723,7 @@ OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/bin/gcpp
+OLD_FILES+=usr/bin/gperf
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
@@ -1754,10 +1749,13 @@ OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
+OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
+OLD_FILES+=usr/share/man/man1/gperf.1.gz
+OLD_FILES+=usr/share/man/man1/gperf.7.gz
 .endif
 
 .if ${MK_GCOV} == no