git: 15deee52d6d5 - main - Move GH_BC ObsoleteFiles.inc section to OptionalObsoleteFiles.inc

[Dimitry Andric]

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=15deee52d6d5ea7dd950116ff63aa2c33fcd47f5

commit 15deee52d6d5ea7dd950116ff63aa2c33fcd47f5
Author:     Dimitry Andric <dim at FreeBSD.org>
AuthorDate: 2021-03-20 22:15:01 +0000
Commit:     Dimitry Andric <dim at FreeBSD.org>
CommitDate: 2021-03-20 22:15:01 +0000

    Move GH_BC ObsoleteFiles.inc section to OptionalObsoleteFiles.inc
    
    Optional features belong in the latter file, and should be tested using:
    
    .if ${MK_FEATURE} == no
    [...]
    .endif
---
 ObsoleteFiles.inc                        | 9 ---------
 tools/build/mk/OptionalObsoleteFiles.inc | 8 ++++++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 79ed21ec18ca..2132dc4289b4 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -2884,15 +2884,6 @@ OLD_FILES+=usr/include/crypto/xform_enc.h
 # 20210305: removed Poly1305_* symbols
 OLD_FILES+=usr/include/crypto/xform_poly1305.h
 
-# 20210304: remove old bc and dc support and test files
-.if !defined(WITHOUT_GH_BC)
-OLD_FILES+=usr/share/misc/bc.library
-OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
-OLD_FILES+=usr/tests/usr.bin/dc/bcode
-OLD_FILES+=usr/tests/usr.bin/dc/inout
-OLD_DIRS+=usr/tests/usr.bin/dc
-.endif
-
 # 20210302: fmtree removed
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 44cd4a4281e7..5a534a91c057 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2139,6 +2139,14 @@ OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
 .endif
 
+.if ${MK_GH_BC} == no
+OLD_FILES+=usr/share/misc/bc.library
+OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/dc/bcode
+OLD_FILES+=usr/tests/usr.bin/dc/inout
+OLD_DIRS+=usr/tests/usr.bin/dc
+.endif
+
 .if ${MK_GOOGLETEST} == no
 OLD_FILES+=usr/include/gmock/gmock-actions.h
 OLD_FILES+=usr/include/gmock/gmock-cardinalities.h