git: 7bf8bd9de347 - stable/12 - Update UNIFIED_OBJDIR descriptions

The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=7bf8bd9de347146e12ae2d7a4529637228e69b67

commit 7bf8bd9de347146e12ae2d7a4529637228e69b67
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-05-02 17:53:30 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-05-07 01:12:06 +0000

    Update UNIFIED_OBJDIR descriptions
    
    src.conf(5) previously stated they would be removed before FreeBSD 12.0,
    but that did not happen.  Change it to "a future version of FreeBSD."
    
    Also pick up LOADER_KBOOT change (enabled on x86) in src.conf regen.
    
    Reported by:    jhb
    MFC after:      3 days
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit b7f53cdcf8d5025bf5bb04f60602e6f2bb4ae7ae)
    (cherry picked from commit 2103ecdad8d00f320d0552d9adee65945ed7ac5f)
---
 share/man/man5/src.conf.5                  | 5 +++--
 tools/build/options/WITHOUT_UNIFIED_OBJDIR | 3 ++-
 tools/build/options/WITH_UNIFIED_OBJDIR    | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 606e61a4e9c4..d3af8e62fbda 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd June 28, 2021
+.Dd May 2, 2022
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -1947,7 +1947,8 @@ while for cross-builds
 .Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR}
 is used.
 .Pp
-This option is transitional and will be removed before the 12.0 release,
+This option is transitional and will be removed in a future version of
+.Fx ,
 at which time
 .va WITH_UNIFIED_OBJDIR
 will be enabled permanently.
diff --git a/tools/build/options/WITHOUT_UNIFIED_OBJDIR b/tools/build/options/WITHOUT_UNIFIED_OBJDIR
index 355730c4a17e..7683f0058f59 100644
--- a/tools/build/options/WITHOUT_UNIFIED_OBJDIR
+++ b/tools/build/options/WITHOUT_UNIFIED_OBJDIR
@@ -9,7 +9,8 @@ while for cross-builds
 .Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR}
 is used.
 .Pp
-This option is transitional and will be removed before the 12.0 release,
+This option is transitional and will be removed in a future version of
+.Fx ,
 at which time
 .va WITH_UNIFIED_OBJDIR
 will be enabled permanently.
diff --git a/tools/build/options/WITH_UNIFIED_OBJDIR b/tools/build/options/WITH_UNIFIED_OBJDIR
index 6efc01d09c5e..2bded8d521bb 100644
--- a/tools/build/options/WITH_UNIFIED_OBJDIR
+++ b/tools/build/options/WITH_UNIFIED_OBJDIR
@@ -6,7 +6,8 @@ For cross-builds, native-builds, and sub-directory builds, the format of
 .Pa ${MAKEOBJDIRPREFIX}/${.CURDIR}/${TARGET}.${TARGET_ARCH}
 is used.
 .Pp
-This option is transitional and will be removed before the 12.0 release,
+This option is transitional and will be removed in a future version of
+.Fx ,
 at which time
 .va WITH_UNIFIED_OBJDIR
 will be enabled permanently.