From owner-svn-src-all@freebsd.org  Thu Sep 17 04:22:01 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 6343F9CEE63;
 Thu, 17 Sep 2015 04:22:01 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 53A9A10B7;
 Thu, 17 Sep 2015 04:22:01 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8H4M1vp079233;
 Thu, 17 Sep 2015 04:22:01 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8H4M1tn079232;
 Thu, 17 Sep 2015 04:22:01 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201509170422.t8H4M1tn079232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 17 Sep 2015 04:22:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287899 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Sep 2015 04:22:01 -0000

Author: bdrewery
Date: Thu Sep 17 04:22:00 2015
New Revision: 287899
URL: https://svnweb.freebsd.org/changeset/base/287899

Log:
  META_MODE: Default OBJROOT to the traditional /usr/src/SRCTOP/.
  
  This avoids easily colliding multiple src trees with the same objects.  Having
  multiple checkouts in dir/ dir2/ dir3/ would all use obj/ without any unique
  identifier inside of obj/.  This pattern is more likely to be used due
  to the non-META_MODE behavior working with it fine.
  
  In environments where ../obj/ is wanted as the obj directory the value of
  OBJROOT can be set to ${SRCTOP:H}/obj/ instead via src-env.conf (set by
  SRC_ENV_CONF) or environment.  For environment it must be single quoted or
  escaped.  This will be more likely for vendors who are building images or using
  NFS for builds.  In those cases MAKEOBJDIRPREFIX may already be utilized and
  is supported.
  
  Discussed with:	imp
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/local.meta.sys.mk

Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk	Thu Sep 17 04:01:05 2015	(r287898)
+++ head/share/mk/local.meta.sys.mk	Thu Sep 17 04:22:00 2015	(r287899)
@@ -31,7 +31,7 @@ SB_OBJROOT ?= ${SB}/obj/
 # this is what we use below
 OBJROOT ?= ${SB_OBJROOT}
 .endif
-OBJROOT ?= ${SRCTOP:H}/obj/
+OBJROOT ?= /usr/obj/${SRCTOP}/
 .if ${OBJROOT:M*/} != ""
 OBJROOT:= ${OBJROOT:H:tA}/
 .else