From owner-freebsd-current Tue Apr 6 12:23:37 1999 Delivered-To: freebsd-current@freebsd.org Received: from isbalham.ist.co.uk (isbalham.ist.co.uk [192.31.26.1]) by hub.freebsd.org (Postfix) with ESMTP id 5F5DC1544E for ; Tue, 6 Apr 1999 12:23:15 -0700 (PDT) (envelope-from rb@gid.co.uk) Received: from gid.co.uk (uucp@localhost) by isbalham.ist.co.uk (8.8.7/8.8.7) with UUCP id UAA01500; Tue, 6 Apr 1999 20:20:35 +0100 (BST) (envelope-from rb@gid.co.uk) Received: from [194.32.164.2] by seagoon.gid.co.uk; Tue, 6 Apr 1999 20:15:15 +0100 (BST) X-Sender: rb@194.32.164.1 Message-Id: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Date: Tue, 6 Apr 1999 20:15:13 +0000 To: current@FreeBSD.ORG From: Bob Bishop Subject: Band-aid for building world with -jn [PATCH] Cc: obrien@NUXI.com Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi, The following patch makes -jn work. I don't claim it's any sort of long-term solution. The hack consists of simply dropping .NOTPARALLEL: into the right Makefile, but since .NOTPARALLEL is broken (see bin/10985 for the gory details) you'll need the attached patch for make too. Index: src/gnu/usr.bin/cc/cc_tools/Makefile =================================================================== RCS file: /CVSROOT/src/gnu/usr.bin/cc/cc_tools/Makefile,v retrieving revision 1.18 diff -c -r1.18 Makefile *** Makefile 1999/04/05 10:18:50 1.18 --- Makefile 1999/04/06 17:29:50 *************** *** 2,7 **** --- 2,10 ---- # $Id: Makefile,v 1.18 1999/04/05 10:18:50 peter Exp $ # + # XXX band-aid for -jn + .NOTPARALLEL: + # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk # is such a !@#!*#% nightmare because of how it reprograms the dependencies, Index: src/usr.bin/make/main.c =================================================================== RCS file: /CVSROOT/src/usr.bin/make/main.c,v retrieving revision 1.30 diff -c -r1.30 main.c *** main.c 1999/03/01 06:01:05 1.30 --- main.c 1999/04/06 12:59:59 *************** *** 123,129 **** static Lst variables; /* list of variables to print */ int maxJobs; /* -j argument */ static Boolean forceJobs; /* -j argument given */ ! static int maxLocal; /* -L argument */ Boolean compatMake; /* -B argument */ Boolean debug; /* -d flag */ Boolean noExecute; /* -n flag */ --- 123,129 ---- static Lst variables; /* list of variables to print */ int maxJobs; /* -j argument */ static Boolean forceJobs; /* -j argument given */ ! int maxLocal; /* -L argument */ Boolean compatMake; /* -B argument */ Boolean debug; /* -d flag */ Boolean noExecute; /* -n flag */ Index: src/usr.bin/make/parse.c =================================================================== RCS file: /CVSROOT/src/usr.bin/make/parse.c,v retrieving revision 1.20 diff -c -r1.20 parse.c *** parse.c 1999/01/08 18:37:34 1.20 --- parse.c 1999/04/06 16:34:14 *************** *** 874,881 **** --- 874,884 ---- case NotParallel: { extern int maxJobs; + extern int maxLocal; maxJobs = 1; + maxLocal = 1; + compatMake = 1; /* would have been turned on if no -j */ break; } case SingleShell: -- Bob Bishop (0118) 977 4017 international code +44 118 rb@gid.co.uk fax (0118) 989 4254 between 0800 and 1800 UK To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message