From owner-svn-src-all@FreeBSD.ORG Thu Jan 1 21:14:02 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08FA51F8; Thu, 1 Jan 2015 21:14:02 +0000 (UTC) Received: from mail-pd0-x22f.google.com (mail-pd0-x22f.google.com [IPv6:2607:f8b0:400e:c02::22f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BE5D4D32; Thu, 1 Jan 2015 21:14:01 +0000 (UTC) Received: by mail-pd0-f175.google.com with SMTP id g10so22754985pdj.20; Thu, 01 Jan 2015 13:14:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :message-id:references:to; bh=W6AikZ5N4ncFurjnfOvlwNEshIrTi5uUvzmvVmIErv0=; b=Auk7yCAJOt1VDNWgBtVFuB7Y76HSLlFenzc370Yng3JTpcSG16UkzABTrASaupvatY t+FjSqr3uZYRx+rYc64y3OInCmaU3w/L76E7BDzWiQcR7/fBQo7GMgb8j1Z07OD9AM6J PARh4Nt2FaooGyT1j2k/4lGfd9LVCPzWQ0XZAzxIvb2md58P+DQfhXpapdjK/Z8OHpYl uoMEHaMYBbNANDa9PtcVhlcBOCq4DxFVbopu0+2oP6tWSrKef8mxSBKktu26lS/E7Pm2 dnhqkT2zYyUI/ixrw1B7Q45vteAwarcuYOTo5uQYnAG7OnrVXpaAFhCS2X7hy+ERRefb yMFA== X-Received: by 10.68.197.8 with SMTP id iq8mr92102879pbc.66.1420146841067; Thu, 01 Jan 2015 13:14:01 -0800 (PST) Received: from ?IPv6:2601:8:ab80:7d6:6d22:f632:3b17:f5d8? ([2601:8:ab80:7d6:6d22:f632:3b17:f5d8]) by mx.google.com with ESMTPSA id nt6sm44703136pdb.26.2015.01.01.13.13.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Jan 2015 13:14:00 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_94D28C94-D7E1-47B9-94F7-47655A5DDC34"; protocol="application/pgp-signature"; micalg=pgp-sha512 Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r276052 - head From: Garrett Cooper In-Reply-To: <23AC4621-7748-4724-BBDC-139E9F74CD99@gmail.com> Date: Thu, 1 Jan 2015 13:13:57 -0800 Message-Id: <00AE655C-0609-4FB0-A275-4A0B0AC9DF97@gmail.com> References: <201412220452.sBM4qPAx096443@svn.freebsd.org> <68874DE1-3EAE-4A4D-9760-7661DA7AE846@FreeBSD.org> <1420130463.85983.0.camel@freebsd.org> <9A1C084E-B491-4581-A21C-AAB82687C588@FreeBSD.org> <1420133565.85983.5.camel@freebsd.org> <23AC4621-7748-4724-BBDC-139E9F74CD99@gmail.com> To: Dimitry Andric X-Mailer: Apple Mail (2.1878.6) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers , Garrett Cooper , Ian Lepore X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jan 2015 21:14:02 -0000 --Apple-Mail=_94D28C94-D7E1-47B9-94F7-47655A5DDC34 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jan 1, 2015, at 10:58, Garrett Cooper wrote: > On Jan 1, 2015, at 10:51, Dimitry Andric wrote: >=20 >> On 01 Jan 2015, at 19:42, Garrett Cooper = wrote: >>>=20 >>> On Jan 1, 2015, at 10:38, Garrett Cooper = wrote: >>>> On Jan 1, 2015, at 9:50, Dimitry Andric wrote: >> ... >>>>> No, just MK_INFO=3Dyes, as I said. That is what Garrett tried to = fix in >>>>> this commit, but which only works for native builds. >>>>>=20 >>>>> I'll be coming up with a fix shortly. >>>>=20 >>>> OBJTREE is being populated with TARGET.TARGET_ARCH twice=85 That=92s = the bug. >>>>=20 >>>> Unfortunately this commit only made this issue apparent. Sorry for = not testing with a non-native build :(... >>>=20 >>> I suspect this will fix it. Going to do a tinderbox run then I=92ll = put it out for review: >>>=20 >>> Index: Makefile.inc1 >>> =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 >>> --- Makefile.inc1 (revision 276492) >>> +++ Makefile.inc1 (working copy) >>> @@ -267,8 +267,7 @@ >>> MK_LLDB=3Dno MK_TESTS=3Dno >>>=20 >>> # build-tools stage >>> -TMAKE=3D MAKEOBJDIRPREFIX=3D${OBJTREE} \ >>> - ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ >>> +TMAKE=3D ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f = Makefile.inc1 \ >>> TARGET=3D${TARGET} TARGET_ARCH=3D${TARGET_ARCH} \ >>> DESTDIR=3D \ >>> BOOTSTRAPPING=3D${OSRELDATE} \ >>=20 >> Hm, wasn't MAKEOBJDIRPREFIX set to that value on purpose, originally? >> And if so, won't removing it break some assumption elsewhere? That >> said, this was added in r54684, 15 years ago, so maybe this is = slightly >> out of date. :-) >>=20 >> What I've tried instead, is this: >>=20 >> Index: Makefile.inc1 >> =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 >> --- Makefile.inc1 (revision 276480) >> +++ Makefile.inc1 (working copy) >> @@ -270,6 +271,7 @@ >> TMAKE=3D MAKEOBJDIRPREFIX=3D${OBJTREE} \ >> ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ >> TARGET=3D${TARGET} TARGET_ARCH=3D${TARGET_ARCH} \ >> + WORLDTMP=3D${WORLDTMP} \ >> DESTDIR=3D \ >> BOOTSTRAPPING=3D${OSRELDATE} \ >> SSP_CFLAGS=3D \ >>=20 >> I'm currently testing this with a buildworld, and while it isn't >> finished yet, it has died either, until now. :) >=20 > Removing MAKEOBJDIRPREFIX got me through build-tools with = TARGET/TARGET_ARCH=3Dpowerpc and a native build as well. >=20 > MAKEOBJDIRPREFIX gets set above it: >=20 > 190 .if ${MACHINE} =3D=3D ${TARGET} && ${MACHINE_ARCH} =3D=3D = ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) > 191 OBJTREE=3D ${MAKEOBJDIRPREFIX} > 192 .else > 193 OBJTREE=3D ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} > 194 .endif > ... > 270 TMAKE=3D ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f = Makefile.inc1 \ >=20 > That being said, my commit was probably broken in a cross-build = environment anyhow, as it was installing to ${WORLDTMP}/usr/bin, not = ${WORLDTMP}/legacy/usr/bin (the latter is where all of the build tools = go). Oh cool. More make tinderbox broken-ness=85 = https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D196425 . --Apple-Mail=_94D28C94-D7E1-47B9-94F7-47655A5DDC34 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 iQEcBAEBCgAGBQJUpbiXAAoJEMZr5QU6S73e8BAH/2BkEpAjOSVGedCWJBfELvIQ LuEGUIsjyIeWufd18KMWXPASz/LcHuzvVuo5i8S7ssyMNcaKQmIPFJJnqTXPOOdt tcsRMPlONT4/y+XuXLudbfpKX/gECGFJkJdB1jp2Cjto9RS6p/zpV0G5QCxj0ljt skCjBdUnVPSNyLmDIiM6AbR2keA29uwFDJFpgDgRTArdJWqcQhTU7dQ9qEa3U9Qk uMnsZXEg0IsnfhP9pQa1p/OBgcNuIZ/OnP4q1V1gvLHF893d60+xSFuzXf6PHgBe BfEVQahjFKfHS9Iflass/ydPN7EH1635VD0kFEv4sDadrXsTkvKMsADhCmLAyhU= =0YgZ -----END PGP SIGNATURE----- --Apple-Mail=_94D28C94-D7E1-47B9-94F7-47655A5DDC34--