From owner-svn-src-head@FreeBSD.ORG Thu Jan 1 18:38:34 2015 Return-Path: Delivered-To: svn-src-head@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 4B4FD627; Thu, 1 Jan 2015 18:38:34 +0000 (UTC) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (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 0EAB18AC; Thu, 1 Jan 2015 18:38:34 +0000 (UTC) Received: by mail-pa0-f49.google.com with SMTP id eu11so22671138pac.8; Thu, 01 Jan 2015 10:38:33 -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=VCoxqhtlQ5ia0EegP667brPryI4IGRpm+jkcSrRVo98=; b=JqanODWpqqzuuYhAFIjouXE8LiE7iJqqnusRNxutitoVuWWFp846er/uh0aQn2DnbX oLOwBlHA7nDqqKPYrd5ixzYrvCa97i/gJQDI7e0AyD7Vj3lXfcd9V8ALgYg8JmjtxmHy 8YeUS4XFD6GmQis/Nd96klql1Zpj0wSo/Np0brvtpIThr67XL1xjzBc9kERa0p/2azLK 9f3GZ9hHrGQUrWpzWnhXP86e8alKmUVR1hFPIPVHZ6YRWUQK/A9VYEEWD1GCO2zX7l/r dGwUbpns+yDCM+BBlxUwodVpcRJdnkCpdNDxvrE3DPvIAqWHFe6zdhXzrWQhtoOMwzGE sBnw== X-Received: by 10.66.65.234 with SMTP id a10mr69043457pat.120.1420137513364; Thu, 01 Jan 2015 10:38:33 -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 fu1sm44367864pbb.91.2015.01.01.10.38.32 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Jan 2015 10:38:32 -0800 (PST) Content-Type: multipart/signed; boundary="Apple-Mail=_B4264039-AFEA-424E-8BCB-1A18C295090C"; 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: Date: Thu, 1 Jan 2015 10:38:27 -0800 Message-Id: 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> 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Thu, 01 Jan 2015 18:38:34 -0000 --Apple-Mail=_B4264039-AFEA-424E-8BCB-1A18C295090C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=windows-1252 On Jan 1, 2015, at 9:50, Dimitry Andric wrote: > On 01 Jan 2015, at 18:32, Ian Lepore wrote: >>=20 >> On Thu, 2015-01-01 at 18:14 +0100, Dimitry Andric wrote: >>> On 01 Jan 2015, at 17:41, Ian Lepore wrote: >>>>=20 >>>> On Thu, 2015-01-01 at 16:50 +0100, Dimitry Andric wrote: >>>>> On 22 Dec 2014, at 05:52, Garrett Cooper wrote: >>>>>>=20 >>>>>> Author: ngie >>>>>> Date: Mon Dec 22 04:52:24 2014 >>>>>> New Revision: 276052 >>>>>> URL: https://svnweb.freebsd.org/changeset/base/276052 >>>>>>=20 >>>>>> Log: >>>>>> Build selective portions of gnu/usr.bin/texinfo as part of = build-tools to >>>>>> ensure that building on a host without makeinfo (i.e. a host = where >>>>>> make delete-old -DWITHOUT_INFO was run), then building with = MK_INFO =3D=3D yes >>>>>> doesn't manifest in build errors when building info pages >>>>> .. >>>>>> @@ -1398,6 +1403,16 @@ build-tools: .MAKE >>>>>> ${MAKE} DIRPRFX=3D${_tool}/ depend && \ >>>>>> ${MAKE} DIRPRFX=3D${_tool}/ all >>>>>> .endfor >>>>>> +.for _tool in \ >>>>>> + ${_texinfo} >>>>>> + ${_+_}@${ECHODIR} "=3D=3D=3D> ${_tool} = (obj,depend,all)"; \ >>>>>> + cd ${.CURDIR}/${_tool} && \ >>>>>> + ${MAKE} DIRPRFX=3D${_tool}/ obj && \ >>>>>> + ${MAKE} DIRPRFX=3D${_tool}/ depend && \ >>>>>> + ${MAKE} DIRPRFX=3D${_tool}/ all && \ >>>>>> + ${MAKE} DIRPRFX=3D${_tool}/ install = DESTDIR=3D${WORLDTMP} >>>>>> +.endfor >>>>>=20 >>>>> Strangely, this hunk seems to work incorrectly for non-native = builds. >>>>> For example, I tried a TARGET=3Darm buildworld just now, and that = dies >>>>> with the following error: >>>>>=20 >>>>> [...] >>>>>>>> stage 2.3: build tools >>>>> [...] >>>>> =3D=3D=3D> gnu/usr.bin/texinfo/makeinfo (obj,depend,all,install) >>>>> [...] >>>>> gzip -cn = /usr/src/gnu/usr.bin/texinfo/makeinfo/../../../../contrib/texinfo/doc/make= info.1 > makeinfo.1.gz >>>>> sh /usr/src/tools/install.sh -s -o root -g wheel -m 555 makeinfo = /usr/obj/arm.arm/arm.arm/usr/src/tmp/usr/bin/makeinfo >>>>> install: /usr/obj/arm.arm/arm.arm/usr/src/tmp/usr/bin/makeinfo: No = such file or directory >>>>> *** Error code 71 >>>>>=20 >>>>> Specifically, the /usr/obj/arm.arm/arm.arm directory is incorrect, = there >>>>> should be only one "arm.arm" in that path. I don't really = understand >>>>> how that value comes to pass, though. When I put an echo = statement just >>>>> before the make install, which shows the values of ${_tool} and >>>>> ${WORLDTMP}, it prints: >>>>>=20 >>>>> DEBUG: _tool=3Dgnu/usr.bin/texinfo/makeinfo, = WORLDTMP=3D/usr/obj/arm.arm/arm.arm/usr/src/tmp >>>>>=20 >>>>> So for some strange reason, ${WORLDTMP} is incorrect at that = point? I >>>>> think something is appending one path component too many... >>>>>=20 >>>>> -Dimitry >>>>>=20 >>>>=20 >>>> try TARGET_ARCH=3Darm >>>=20 >>> No, that does not help, unfortunately. The problem seems to be that = in >>> Makefile.inc1, TMAKE is passing MAKEOBJDIRPREFIX=3D${OBJTREE} via = its >>> environment, and this changes the value of WORLDTMP to an incorrect >>> value. >>>=20 >>> At first it looked like I could just force the correct WORLDTMP = value >>> via the command line instead, e.g. like 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 +270,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 >>> However, this leads to other problems further down the road, where = it >>> gets errors installing parts of libllvmsupport and tblgen. >>>=20 >>> So at this point, non-native builds with MK_INFO=3Dyes are broken. >>>=20 >>> -Dimitry >>>=20 >>=20 >> You seem to be implying that the whole process of cross building is >> broken, but it's not. I do this all day long every day. "make >> TARGET_ARCH=3Darm [make targets and other vars here]" works. Do you = have >> something in make.conf or src.conf causing problems? >=20 > 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. OBJTREE is being populated with TARGET.TARGET_ARCH twice=85 That=92s the = bug. Unfortunately this commit only made this issue apparent. Sorry for not = testing with a non-native build :(... --Apple-Mail=_B4264039-AFEA-424E-8BCB-1A18C295090C 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 iQEcBAEBCgAGBQJUpZQjAAoJEMZr5QU6S73encYH/0X0WdzM7gxItyi2y2674dzQ gZJ1G77uHxq2z5OwkmuTSfdoRTRG+1QpP9HK/pFMZxCT1MBMEvUap9i1MTkwIYHH 6XJXzgf5TmoGOZ82pyqFG8yeotnUNV5q6kjkvWtegQGBA9Dr83UXyPXYMj/OFE5H 32FT0hAwN+6m19U5Xkimeh9ijBTebN5oK34+P4LrPuPOc++c7YJgLwSte3ELh7+l PTrjfaI3gfzeaN/kJtZOy/jnBtKGo9Ji8HrksLfnO0/Yrj8relAfhWHUfMrMdiYE Ix7qwE+OfDvfJ1UCjEAHRfbmELvybaTuna4DQpNJV0bAgRgHD+nfYoBIToVdyx0= =CjyP -----END PGP SIGNATURE----- --Apple-Mail=_B4264039-AFEA-424E-8BCB-1A18C295090C--