From owner-svn-src-stable-9@FreeBSD.ORG Thu Jan 8 10:18:16 2015 Return-Path: Delivered-To: svn-src-stable-9@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 C5F29E01; Thu, 8 Jan 2015 10:18:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A736B9C2; Thu, 8 Jan 2015 10:18:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t08AIGG7084252; Thu, 8 Jan 2015 10:18:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t08AIG5j084251; Thu, 8 Jan 2015 10:18:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201501081018.t08AIG5j084251@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 8 Jan 2015 10:18:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r276816 - stable/9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jan 2015 10:18:17 -0000 Author: bapt Date: Thu Jan 8 10:18:15 2015 New Revision: 276816 URL: https://svnweb.freebsd.org/changeset/base/276816 Log: MFS: r276576, r276594 Make texinfo a bootstrap tools this fixes cross building when makeinfo is not available on the host install-info is also needed for installworld so add it to the bootstrap tools Add BPATH to the installworld path to ensure using installworld works if install-info is not in base Modified: stable/9/Makefile.inc1 (contents, props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Thu Jan 8 10:13:56 2015 (r276815) +++ stable/9/Makefile.inc1 Thu Jan 8 10:18:15 2015 (r276816) @@ -234,6 +234,7 @@ CROSSENV+= GROFF_BIN_PATH=${WORLDTMP}/le GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac .endif +_BOOTSTRAP_MAKEINFO?= ${MK_INFO} # bootstrap-tools stage BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${BPATH}:${PATH} \ @@ -248,6 +249,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ + _BOOTSTRAP_MAKEINFO=${_BOOTSTRAP_MAKEINFO} \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD # build-tools stage @@ -729,6 +731,7 @@ MTREE_MAGIC?= mtree 2.0 distributeworld installworld: installcheck installcheck_UGID mkdir -p ${INSTALLTMP} + export PATH=${BPATH}:${PATH} ; \ progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ echo $$progpath; \ @@ -1167,6 +1170,11 @@ _dtrace_tools= cddl/usr.bin/sgsmsg cddl/ _dtc= gnu/usr.bin/dtc .endif +.if ${_BOOTSTRAP_MAKEINFO} != "no" +_texinfo= gnu/usr.bin/texinfo/libtxi \ + gnu/usr.bin/texinfo/makeinfo \ + gnu/usr.bin/texinfo/install-info +.endif # Please document (add comment) why something is in 'bootstrap-tools'. # Try to bound the building of the bootstrap-tool to just the # FreeBSD versions that need the tool built at this stage of the build. @@ -1193,7 +1201,8 @@ bootstrap-tools: ${_gensnmptree} \ usr.sbin/config \ ${_crunchgen} \ - ${_nmtree} + ${_nmtree} \ + ${_texinfo} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -1221,11 +1230,6 @@ _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 @@ -1258,15 +1262,6 @@ 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 #