svn commit: r276549 - stable/9

[NGie Cooper]

On Wed, Jan 7, 2015 at 9:24 AM, Glen Barber <gjb at freebsd.org> wrote:

...

>> 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.

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196426 -- I'm not
entirely sure why this was MFCed without the corresponding fix though
TBH, but it might have been because it would have broken the native
builds done on CURRENT post MK_INFO's removal in CURRENT.
Thanks!