Date: Wed, 7 Jan 2015 17:24:10 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r276549 - stable/9 Message-ID: <20150107172410.GC1266@hub.FreeBSD.org> In-Reply-To: <201501021832.t02IWsnk061192@svn.freebsd.org> References: <201501021832.t02IWsnk061192@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] 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 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUrWu6AAoJEAMUWKVHj+KT7+sP/Amn+Lb7UhPKF08YQwOrAqer KRaCcEI/lejZ9e2x4ppXaAtokHIM5Ayxs7njQR350C3+91ncPN3Ng2lZ6jm8Jk9a Xjt4yVFyAmRTrzleLB5IJD00u7Un0K4HkN/foy2Mxrmd5U3KMjEAcGagExU5KPEt NVXtWSZdxWJ/969cyGKHOMFf2SOozs/dzk/dwDCAR+aWml7JKYl1A1j8QUosOFOx OVp6XuaNw7jQR6dbHNxPoV3DiEuLpEEh6/YfaeIEwxOHqUyrSzh2wXcTbUJNuWHQ SL+oaPJJoNrk+pFkPPrCbMLmFiqYcAJDdIa/qExZtzVTt/us6f4OP+gFAib7860m UjEEdr0Ucm+HCYxI8YHwsC0DRzXqzGFiH8DQqR2iY9qqXve3ZjCK0E3957xfpeG9 OnI8pjw3sULzAykLNhwmD5Qg9D6XcGH9HAyVZn2af1IEIawUFmYr4AZWtnznxgZO 39f53kaHpFeGBPoKSfoaV50DG0CEetUfpxnSxj2L2u0h0mGtr1kIp3tkUQNw9VFn BejypIo0AKkDki4ZepF3uY8aZcNpUBVMTmaCY1xIw6liVs/nzPzmJ+J/jY6QC4AN 6vN8yFN0DOVI6AWwW4wPMA5bAezIPnDRKS2iszCJ3wC1n6EWFf5SS6gl69LajnY2 2ncegC/dsh0o93xfvU/i =9HVV -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150107172410.GC1266>