On Wed, Jan 07, 2015 at 10:46:29PM +0100, Baptiste Daroussin wrote: > On Wed, Jan 07, 2015 at 05:24:10PM +0000, Glen Barber wrote: > > On Fri, Jan 02, 2015 at 06:32:54PM +0000, Baptiste Daroussin wrote: > > > Author: bapt > > > Date: Fri Jan 2 18:32:53 2015 > > > New Revision: 276549 > > > URL: https://svnweb.freebsd.org/changeset/base/276549 > > > > > > Log: > > > MFC: r276052,r276053 > > > > > > 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 == > > > yes > > > doesn't manifest in build errors when building info pages > > > > > > This manifested itself like the following when I was build testing an > > > MFC > > > change on stable/10: > > > > > > makeinfo --no-split -I /usr/src/gnu/lib/libregex/doc -I > > > /usr/src/gnu/lib/libregex/doc regex.texi -o regex.info > > > makeinfo: not found > > > *** [regex.info] Error code 127 > > > > > > make[6]: stopped in /usr/src/gnu/lib/libregex/doc > > > 1 error > > > > > > Modified: > > > stable/9/Makefile.inc1 (contents, props changed) > > > Directory Properties: > > > stable/9/ (props changed) > > > > > > Modified: stable/9/Makefile.inc1 > > > ============================================================================== > > > --- stable/9/Makefile.inc1 Fri Jan 2 18:31:12 2015 > > > (r276548) > > > +++ stable/9/Makefile.inc1 Fri Jan 2 18:32:53 2015 > > > (r276549) > > > @@ -1221,6 +1221,11 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools > > > _kerberos5_tools= kerberos5/tools > > > .endif > > > > > > +.if ${MK_INFO} != "no" > > > +_texinfo= gnu/usr.bin/texinfo/libtxi \ > > > + gnu/usr.bin/texinfo/makeinfo > > > +.endif > > > + > > > .if ${MK_RESCUE} != "no" > > > _rescue= rescue/rescue > > > .endif > > > @@ -1253,6 +1258,16 @@ build-tools: > > > ${MAKE} DIRPRFX=${_tool}/ depend; \ > > > ${MAKE} DIRPRFX=${_tool}/ all > > > .endfor > > > +.for _tool in \ > > > + ${_texinfo} > > > + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ > > > + cd ${.CURDIR}/${_tool} && \ > > > + ${MAKE} DIRPRFX=${_tool}/ obj && \ > > > + ${MAKE} DIRPRFX=${_tool}/ depend && \ > > > + ${MAKE} DIRPRFX=${_tool}/ all && \ > > > + ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP} > > > +.endfor > > > + > > > > > > > This breaks cross-building on amd64 in ways I don't quite understand > > yet. > > > > The relevant errors are: > > > > sh /releng/scripts-snapshot/chroots/9/i386/snap/tools/install.sh -s -o > > root -g wheel -m 555 makeinfo > > > > /releng/scripts-snapshot/scripts/../chroots/9-obj/i386/snap/i386.i386/i386.i386/releng/scripts-snapshot/chroots/9/i386/snap/tmp/usr/bin/makeinfo > > sh /releng/scripts-snapshot/chroots/9/i386/snap/tools/install.sh -o root > > -g wheel -m 444 makeinfo.1.gz > > > > /releng/scripts-snapshot/scripts/../chroots/9-obj/i386/snap/i386.i386/i386.i386/releng/scripts-snapshot/chroots/9/i386/snap/tmp/usr/share/man/man1 > > install: > > /releng/scripts-snapshot/scripts/../chroots/9-obj/i386/snap/i386.i386/i386.i386/releng/scripts-snapshot/chroots/9/i386/snap/tmp/usr/bin/makeinfo: > > No such file or directory > > *** [_proginstall] Error code 71 > > install: > > /releng/scripts-snapshot/scripts/../chroots/9-obj/i386/snap/i386.i386/i386.i386/releng/scripts-snapshot/chroots/9/i386/snap/tmp/usr/share/man/man1: > > No such file or directory > > > > Note the duplicated '${TARGET}.${TARGET_ARCH}' in the path. > > > > Glen > > > > > I will fix asap > Fixed in r276816
Bapt
pgpM0KPY9QFR4.pgp
Description: PGP signature
