From owner-svn-src-head@FreeBSD.ORG Sat Jun 20 22:57:11 2015 Return-Path: Delivered-To: svn-src-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5CEDEAB9 for ; Sat, 20 Jun 2015 22:57:11 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30FD2D24 for ; Sat, 20 Jun 2015 22:57:10 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: by pacyo7 with SMTP id yo7so5105282pac.2 for ; Sat, 20 Jun 2015 15:57:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:message-id:references:to; bh=jFCNLMl7NFSIpEuLgbCCS1wHnkN4BGua7XDvoAdNmL8=; b=SGM5puw55hckkWmA2JJoVHs3JLkQt0p7r+pymgS9p+OTHRFOGlsXtsQIg8jH2vgq7+ p5I+w2cGG+Y6SC2qP+2XMzIUB5rbFotBNEVgw3ehBLDR5STlxMAEuZoPff2CKtBfoHrX O1RepQTmak6nZChkM+1+IkKtbh55L7eWCKpnf7OwI72+URLDVnCChPmD/jKlvC0VJUL3 5Gk2nLV1Chvvbt6VKEz8deQPIBahh1iVt2bVFAWnjIQPbKK0nMMf16bFmEozpGc2MeNL 76i0X13iW5H6smJ/Sb/L8tUMfb++brHLr+KMeVR9Yxon0onc1weQ6yFNBdcNgdSjyT/t gvSw== X-Gm-Message-State: ALoCoQlxdT9353e+tEaSPhFugSdsDBJbvN207XBXMhrkLlkGZ9sYGH+tviqMON1nAr3eRRt2lTDV X-Received: by 10.68.185.37 with SMTP id ez5mr45511301pbc.74.1434841029621; Sat, 20 Jun 2015 15:57:09 -0700 (PDT) Received: from [10.64.27.92] ([69.53.236.236]) by mx.google.com with ESMTPSA id tr3sm15188560pbc.75.2015.06.20.15.57.07 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 20 Jun 2015 15:57:07 -0700 (PDT) Sender: Warner Losh Subject: Re: svn commit: r284650 - head/share/mk Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) Content-Type: multipart/signed; boundary="Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD"; protocol="application/pgp-signature"; micalg=pgp-sha512 X-Pgp-Agent: GPGMail 2.5 From: Warner Losh In-Reply-To: <201506202148.t5KLm7hI091030@svn.freebsd.org> Date: Sat, 20 Jun 2015 16:57:07 -0600 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-Id: <93269D94-59D9-4643-9EE1-12B3A78A3B00@bsdimp.com> References: <201506202148.t5KLm7hI091030@svn.freebsd.org> To: "Simon J. Gerraty" X-Mailer: Apple Mail (2.2098) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 20 Jun 2015 22:57:11 -0000 --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jun 20, 2015, at 3:48 PM, Simon J. Gerraty wrote: >=20 > Author: sjg > Date: Sat Jun 20 21:48:07 2015 > New Revision: 284650 > URL: https://svnweb.freebsd.org/changeset/base/284650 >=20 > Log: > Deal with MAKEOBJDIRPREFIX >=20 > MAKEOBJDIRPREFIX does not really fit our model. > Use it to set OBJROOT to about where user expects > and set MAKEOBJDIR to do what we want. >=20 > Modified: > head/share/mk/local.meta.sys.mk >=20 > Modified: head/share/mk/local.meta.sys.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/share/mk/local.meta.sys.mk Sat Jun 20 20:54:05 2015 = (r284649) > +++ head/share/mk/local.meta.sys.mk Sat Jun 20 21:48:07 2015 = (r284650) > @@ -8,6 +8,18 @@ > MK_INSTALL_AS_USER=3D yes >=20 > .if empty(OBJROOT) || ${.MAKE.LEVEL} =3D=3D 0 > +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}) > +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR... > +# put things approximately where they want > +OBJROOT:=3D${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/ > +# OBJTOP set below > +MAKEOBJDIR=3D$${.CURDIR:S,$${SRCTOP},$${OBJTOP},} > +MAKEOBJDIRPREFIX=3D > +# export but do not track > +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR > +# now for our own use > +MAKEOBJDIR=3D ${.CURDIR:S,${SRCTOP},${OBJTOP},} > +.endif > .if !empty(SB) > SB_OBJROOT ?=3D ${SB}/obj/ > # this is what we use below MAKEOBJDIRPREFIX has been *THE* way to do things in FreeBSD since = ~forever. How does it not fit our model? It is our model. This change is ill = advised. Also, this change will generate about a billion warnings for a = buildworld (one per makefile, per tree traverse). That=E2=80=99s not acceptable. Warner --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVhe/EAAoJEGwc0Sh9sBEAp74P/0rVGgYROcgdeMWX9nfzmi0S tduM7XOOuGu93x/bnQ3drNNWlRWzC2gFFmybx26qvMcJYht/35RosQ+WdXUwlJhn 6SXigz4dGDS5lCe6sr6RNb0d+qOeS5MCLCB0U/Vsp4AYSkiFki9eak987as7KbNF Hyqm1ch+1dL1gJ1g0hb9T5AHPrl4YRR5546HzTwZEGqDmR5APtWLpqs8yzX+/uDh ADUQX6FG1Qjfwf5woGcs2ZJGU+LheZaiySvSlAxXlQzIQb2sWUoeaE1aypyuUEsE +2yzpivDU4Y8jWjL29yhzgt9Z2utdOjq1CNL3JDLIkg12sC8X4EzL9De0H+Z0Qsh WtVGAvsvuH6NS9Fae2CpzI2Gik3MQa5KmhHKr0Jrs21rUCTqoQI30kDbunrWYbXp +0CoUcXlUzLGjuW+T5WVWZJZkIlddtyL5XOvbrupUPZA9cfhHb672MLf0FnmddaM xcfpxxgRT1Lk4U4d2inWjtVHd+Lkphg0xDMtp+gFOPB31P6Aml+k9xT0Jepi5en4 PWtAo3V2KXx7PV7jRWWWS8Hi9m29K+6gw5BpwbJPoD3u6rL3+fYvdgzTKdyMGNct OAPy74v2Z+0+9RkyCEEVZEt/i0NT79Om0Vk8FKKbtuiNC2FFKfR8fTC+upYfWfXF oz5fTH1mrI2a1pkZ+dqb =Sk0s -----END PGP SIGNATURE----- --Apple-Mail=_D055BF88-ED9B-485C-BC84-7850938303FD--