From owner-svn-src-head@freebsd.org Wed Nov 1 21:22:24 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4826AE646A9; Wed, 1 Nov 2017 21:22:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 124FD81E15; Wed, 1 Nov 2017 21:22:24 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA1LMN4t026412; Wed, 1 Nov 2017 21:22:23 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA1LMNNv026411; Wed, 1 Nov 2017 21:22:23 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201711012122.vA1LMNNv026411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 1 Nov 2017 21:22:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325293 - head/share/man/man5 X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/man/man5 X-SVN-Commit-Revision: 325293 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Nov 2017 21:22:24 -0000 Author: bdrewery Date: Wed Nov 1 21:22:23 2017 New Revision: 325293 URL: https://svnweb.freebsd.org/changeset/base/325293 Log: Regenerate for UNIFIED_OBJDIR. Sponsored by: Dell EMC Isilon Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Nov 1 21:22:19 2017 (r325292) +++ head/share/man/man5/src.conf.5 Wed Nov 1 21:22:23 2017 (r325293) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd October 30, 2017 +.Dd November 1, 2017 .Dt SRC.CONF 5 .Os .Sh NAME @@ -73,12 +73,10 @@ variable, which defaults to Some examples that may only be set in this file are .Va WITH_DIRDEPS_BUILD , and -.Va WITH_META_MODE -as they are environment-only variables. -Note that +.Va WITH_META_MODE , +and .Va MAKEOBJDIRPREFIX -may be set here only when using -.Va WITH_DIRDEPS_BUILD . +as they are environment-only variables. .Pp The values of variables are ignored regardless of their setting; even if they would be set to @@ -1499,6 +1497,26 @@ When set, it enforces these options: Set to not build .Xr unbound 8 and related programs. +.It Va WITHOUT_UNIFIED_OBJDIR +Set to use the historical object directory format for +.Xr build 7 +targets. +For native-builds and builds done directly in sub-directories the format of +.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR} +is used, +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, +at which time +.va WITH_UNIFIED_OBJDIR +will be enabled permanently. +.Pp +This must be set in the environment, make command line, or +.Pa /etc/src-env.conf , +not +.Pa /etc/src.conf . .It Va WITHOUT_USB Set to not build USB-related programs and libraries. .It Va WITHOUT_USB_GADGET_EXAMPLES