From owner-freebsd-small Mon Aug 13 13:52:17 2001 Delivered-To: freebsd-small@freebsd.org Received: from tao.org.uk (xwing.creative.net.au [203.56.168.36]) by hub.freebsd.org (Postfix) with ESMTP id 65D3C37B408 for ; Mon, 13 Aug 2001 13:52:10 -0700 (PDT) (envelope-from joe@tao.org.uk) Received: by tao.org.uk (Postfix, from userid 100) id A4DE6490; Mon, 13 Aug 2001 09:26:54 +0100 (BST) Date: Mon, 13 Aug 2001 09:26:54 +0100 From: Josef Karthauser To: Small FreeBSD Subject: Request for testing of a crunchgen patch. Message-ID: <20010813092654.B12557@tao.org.uk> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-md5; protocol="application/pgp-signature"; boundary="GpGaEY17fSl8rd50" Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-small@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --GpGaEY17fSl8rd50 Content-Type: multipart/mixed; boundary="HG+GLK89HZ1zG0kk" Content-Disposition: inline --HG+GLK89HZ1zG0kk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi everyone, I've got a patch to crunchgen which fixes a bug that I introduced around the time of 4.2. I broke the proper handling of this kind of crunch.conf file: progs prog1 special prog1 objdir ../../prog1/obj special prog1 objs prog1.o I'd be very grateful if people could patch crunchgen and test that it still works as expected before I commit the fix. Many thanks, Joe --HG+GLK89HZ1zG0kk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="crunchgen.c-patch" Content-Transfer-Encoding: quoted-printable Index: crunchgen.c =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/usr.sbin/crunch/crunchgen/crunchgen.c,v retrieving revision 1.28 diff -u -r1.28 crunchgen.c --- crunchgen.c 2001/06/20 23:21:02 1.28 +++ crunchgen.c 2001/08/13 07:53:24 @@ -636,7 +636,7 @@ if (!p->objs && p->srcdir && is_nonempty_file(path)) fillin_program_objs(p, path); =20 - if (!p->srcdir && verbose) + if (!p->srcdir && !p->objdir && verbose) warnx("%s: %s: %s", "warning: could not find source directory", infilename, p->name); @@ -644,7 +644,7 @@ warnx("%s: %s: warning: could not find any .o files", infilename, p->name); =20 - if (!p->srcdir || !p->objs) + if (!p->objdir || !p->objs) p->goterror =3D 1; } =20 @@ -962,17 +962,17 @@ =20 fprintf(outmk, "\n# -------- %s\n\n", p->name); =20 + fprintf(outmk, "%s_OBJDIR=3D", p->ident); + if (p->objdir) + fprintf(outmk, "%s", p->objdir); + else + fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n", + p->ident); + fprintf(outmk, "\n"); + if (p->srcdir && p->objs) { fprintf(outmk, "%s_SRCDIR=3D%s\n", p->ident, p->srcdir); fprintf(outmk, "%s_REALSRCDIR=3D%s\n", p->ident, p->realsrcdir); - - fprintf(outmk, "%s_OBJDIR=3D", p->ident); - if (p->objdir) - fprintf(outmk, "%s", p->objdir); - else - fprintf(outmk, "$(MAKEOBJDIRPREFIX)/$(%s_REALSRCDIR)\n", - p->ident); - fprintf(outmk, "\n"); =20 fprintf(outmk, "%s_OBJS=3D", p->ident); output_strlst(outmk, p->objs); --HG+GLK89HZ1zG0kk-- --GpGaEY17fSl8rd50 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjt3j00ACgkQXVIcjOaxUBZaWACdH/Z2DjIXyZKdKeAR3oGz8rZk v4AAoNk6A6O9SNOGSYN6iweFpK/ArA1S =WxR4 -----END PGP SIGNATURE----- --GpGaEY17fSl8rd50-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-small" in the body of the message