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
This commit is contained in:
Dimitry Andric 2021-03-20 23:15:01 +01:00
parent 839fdcfc0c
commit 15deee52d6
2 changed files with 8 additions and 9 deletions

View file

@ -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

View file

@ -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