From owner-cvs-src@FreeBSD.ORG Mon Jun 30 14:48:13 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 202D537B401; Mon, 30 Jun 2003 14:48:13 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0604443FBF; Mon, 30 Jun 2003 14:48:10 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h5ULm4Vd067798 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 1 Jul 2003 00:48:05 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h5ULlvC7067786; Tue, 1 Jul 2003 00:47:57 +0300 (EEST) (envelope-from ru) Date: Tue, 1 Jul 2003 00:47:57 +0300 From: Ruslan Ermilov To: Gordon Tetlow Message-ID: <20030630214757.GD57432@sunbay.com> References: <200306300559.h5U5xZMr049298@repoman.freebsd.org> <20030630113741.GB8393@sunbay.com> <20030630155002.GL70590@roark.gnf.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="m1UC1K4AOz1Ywdkx" Content-Disposition: inline In-Reply-To: <20030630155002.GL70590@roark.gnf.org> User-Agent: Mutt/1.5.4i cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2003 21:48:13 -0000 --m1UC1K4AOz1Ywdkx Content-Type: multipart/mixed; boundary="C94crkcyjafcjHxo" Content-Disposition: inline --C94crkcyjafcjHxo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 30, 2003 at 08:50:02AM -0700, Gordon Tetlow wrote: > On Mon, Jun 30, 2003 at 02:37:41PM +0300, Ruslan Ermilov wrote: > > > > Please de-pessimize the building of crunchide(1) by putting it > > back as ${_crunchide} and only building it for RELEASEDIR or > > !defined(NO_RESCUE) cases. > >=20 > > Please also move crunchgen(1) to bootstrap-tools; only tools > > that use TARGET_ARCH should be put into cross-tools. Please > > also de-pessimize its building by wrapping it to the > > ${BOOTSTRAPPING} version test (anything that's built using > > crunchgen.c,v 1.33 should be sufficient and not require > > bootstrapping). > >=20 > > Please let me know if I should generate the patch. :-) >=20 > If you don't mind. It sounds like you have a better idea of what needs > to be done. >=20 Sure, attached. Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --C94crkcyjafcjHxo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Content-Transfer-Encoding: quoted-printable 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 RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.370 diff -u -r1.370 Makefile.inc1 --- Makefile.inc1 30 Jun 2003 05:59:35 -0000 1.370 +++ Makefile.inc1 30 Jun 2003 21:41:18 -0000 @@ -668,6 +668,11 @@ _yacc=3D usr.bin/yacc .endif =20 +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ + ${BOOTSTRAPPING} < 501100 +_crunchgen=3D usr.sbin/crunch/crunchgen +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol=3D usr.sbin/kbdcontrol .endif @@ -676,7 +681,7 @@ .for _tool in ${_strfile} usr.bin/colldef \ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ - usr.sbin/config ${_kbdcontrol} \ + usr.sbin/config ${_crunchgen} ${_kbdcontrol} \ ${_gperf} ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "=3D=3D=3D> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ @@ -736,12 +741,16 @@ _elf2aout=3D usr.bin/elf2aout .endif =20 +.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ + defined(RELEASEDIR) +_crunchide=3D usr.sbin/crunch/crunchide +.endif + _xlint=3D usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint =20 cross-tools: .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ - gnu/usr.bin/binutils \ - usr.sbin/crunch/crunchgen usr.sbin/crunch/crunchide \ + gnu/usr.bin/binutils ${_crunchide} \ gnu/usr.bin/cc ${_xlint} ${_kgzip} @${ECHODIR} "=3D=3D=3D> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ --C94crkcyjafcjHxo-- --m1UC1K4AOz1Ywdkx Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/ALANUkv4P6juNwoRAiedAJ9uQ56jYDp0i9B9XQhcgqxfSf1d/ACdGqNH Mol9n0CUwRSKO/ZP0/mEtQ0= =kqyp -----END PGP SIGNATURE----- --m1UC1K4AOz1Ywdkx--