git: 2103ecdad8d0 - stable/13 - Update UNIFIED_OBJDIR descriptions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 07 May 2022 01:11:50 UTC
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2103ecdad8d00f320d0552d9adee65945ed7ac5f commit 2103ecdad8d00f320d0552d9adee65945ed7ac5f 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:11:37 +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) --- 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 c1135ebf13c8..7912abde0a98 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 February 8, 2022 +.Dd May 2, 2022 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1664,7 +1664,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 840196941da4..7df78081bb8d 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 2a551e1d9e17..4bc7c6a65904 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.