From owner-freebsd-stable  Sun Nov 12 23:57:26 2000
Delivered-To: freebsd-stable@freebsd.org
Received: from palrel1.hp.com (palrel1.hp.com [156.153.255.242])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2A3A637B479; Sun, 12 Nov 2000 23:57:20 -0800 (PST)
Received: from adlmail.cup.hp.com (adlmail.cup.hp.com [15.0.100.30])
	by palrel1.hp.com (Postfix) with ESMTP
	id D5F57692; Sun, 12 Nov 2000 23:57:18 -0800 (PST)
Received: from cup.hp.com (p1000180.nsr.hp.com [15.109.0.180])
	by adlmail.cup.hp.com (8.9.3 (PHNE_18546)/8.9.3 SMKit7.02) with ESMTP id XAA06651;
	Sun, 12 Nov 2000 23:57:18 -0800 (PST)
Message-ID: <3A0F9ED8.A56CA34E@cup.hp.com>
Date: Sun, 12 Nov 2000 23:57:12 -0800
From: Marcel Moolenaar <marcel@cup.hp.com>
Organization: Hewlett-Packard
X-Mailer: Mozilla 4.73 [en] (X11; U; Linux 2.2.12 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
Cc: current@FreeBSD.ORG, stable@FreeBSD.ORG
Subject: Re: "make modules" kicks the first module directory twice
References: <HLEDJBJKDDPDJBMGCLPPKEFGCIAA.otterr@telocity.com>
		<3A085F93.BC245A53@cup.hp.com> <20001113145812F.matusita@jp.FreeBSD.org>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Makoto MATSUSHITA wrote:
> 
> % make -j 2 modules
> cd ../../modules && env MAKEOBJDIRPREFIX=/usr/src/sys/compile/GENERIC/modules KMODDIR=/boot/kernel make obj all
> ===> 3dfx
> ===> 3dfx
> Warning: Object directory not changed from original /usr/src/sys/modules/3dfx
> (... ok, break it ...)

The problem is in the fact that the Makefile (the one in /sys/conf)
contains something like:

	${MAKE} obj all

and

	${MAKE} obj depend

The net effect is that these targets are built in parallel, which
obviously isn't right. The following solves the problem (i386 only):

Index: Makefile.i386
===================================================================
RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.212
diff -u -r1.212 Makefile.i386
--- Makefile.i386       2000/10/29 09:47:50     1.212
+++ Makefile.i386       2000/11/13 07:49:00
@@ -271,11 +271,13 @@
 
 modules:
        @mkdir -p ${.OBJDIR}/modules
-       cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+       cd $S/modules && env ${MKMODULESENV} ${MAKE} obj && \
+               env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
        @mkdir -p ${.OBJDIR}/modules
-       cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+       cd $S/modules && env ${MKMODULESENV} ${MAKE} obj $$ \
+               env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
        cd $S/modules && env ${MKMODULESENV} ${MAKE} clean

-- 
Marcel Moolenaar
  mail: marcel@cup.hp.com / marcel@FreeBSD.org
  tel:  (408) 447-4222


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message