Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S275589AbTHOAIK (ORCPT ); Thu, 14 Aug 2003 20:08:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S275579AbTHOAIK (ORCPT ); Thu, 14 Aug 2003 20:08:10 -0400 Received: from fw.osdl.org ([65.172.181.6]:24473 "EHLO mail.osdl.org") by vger.kernel.org with ESMTP id S275367AbTHOAIE (ORCPT ); Thu, 14 Aug 2003 20:08:04 -0400 Subject: [PATCH] fix parallel builds for aic7xxx From: John Cherry To: "linux-kernel@vger.kernel.org" , linux-scsi@vger.kernel.org Content-Type: multipart/mixed; boundary="=-SIvbJMgeQQZjhiqMOwH5" Organization: Message-Id: <1060906080.4753.92.camel@cherrytest.pdx.osdl.net> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-4) Date: 14 Aug 2003 17:08:00 -0700 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2777 Lines: 84 --=-SIvbJMgeQQZjhiqMOwH5 Content-Type: text/plain Content-Transfer-Encoding: 7bit My compile regression scripts were getting random build failures for aic7xxx. The two makefiles could not handle parallel build. Occasionally they would succeed...timing dependent. The following two patches fix this. Part 1 - drivers/scsi/aic7xxx/Makefile Part 2 - drivers/scsi/aic7xxx/aicasm/Makefile John --=-SIvbJMgeQQZjhiqMOwH5 Content-Disposition: attachment; filename=part1 Content-Type: text/plain; name=part1; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit --- a/drivers/scsi/aic7xxx/Makefile 2003-08-08 21:42:16.000000000 -0700 +++ b/drivers/scsi/aic7xxx/Makefile 2003-08-14 16:55:13.000000000 -0700 @@ -58,7 +58,9 @@ -p $(obj)/aic7xxx_reg_print.c -i aic7xxx_osm.h ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y) -$(aic7xxx-gen-y): $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm +$(aic7xxx-gen-y): $(src)/aic7xxx.seq + +$(src)/aic7xxx.seq: $(obj)/aicasm/aicasm $(src)/aic7xxx.reg $(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic7xxx_reg.h \ $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \ $(src)/aic7xxx.seq @@ -72,7 +74,9 @@ -p $(obj)/aic79xx_reg_print.c -i aic79xx_osm.h ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y) -$(aic79xx-gen-y): $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm +$(aic79xx-gen-y): $(src)/aic79xx.seq + +$(src)/aic79xx.seq: $(obj)/aicasm/aicasm $(src)/aic79xx.reg $(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic79xx_reg.h \ $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \ $(src)/aic79xx.seq --=-SIvbJMgeQQZjhiqMOwH5 Content-Disposition: attachment; filename=part2 Content-Type: text/plain; name=part2; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit --- a/drivers/scsi/aic7xxx/aicasm/Makefile 2003-08-08 21:40:42.000000000 -0700 +++ b/drivers/scsi/aic7xxx/aicasm/Makefile 2003-08-14 16:39:00.000000000 -0700 @@ -49,14 +49,18 @@ clean: rm -f $(clean-files) -aicasm_gram.c aicasm_gram.h: aicasm_gram.y +aicasm_gram.c: aicasm_gram.h + mv $(<:.h=).tab.c $(<:.h=.c) + +aicasm_gram.h: aicasm_gram.y $(YACC) $(YFLAGS) -b $(<:.y=) $< - mv $(<:.y=).tab.c $(<:.y=.c) mv $(<:.y=).tab.h $(<:.y=.h) -aicasm_macro_gram.c aicasm_macro_gram.h: aicasm_macro_gram.y +aicasm_macro_gram.c: aicasm_macro_gram.h + mv $(<:.h=).tab.c $(<:.h=.c) + +aicasm_macro_gram.h: aicasm_macro_gram.y $(YACC) $(YFLAGS) -b $(<:.y=) -p mm $< - mv $(<:.y=).tab.c $(<:.y=.c) mv $(<:.y=).tab.h $(<:.y=.h) aicasm_scan.c: aicasm_scan.l --=-SIvbJMgeQQZjhiqMOwH5-- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/