From patchwork Wed Sep 18 01:11:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: li rongqing X-Patchwork-Id: 2904401 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 82D209F1E3 for ; Wed, 18 Sep 2013 01:11:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE77E201F7 for ; Wed, 18 Sep 2013 01:11:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 90C93201F4 for ; Wed, 18 Sep 2013 01:11:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751168Ab3IRBLH (ORCPT ); Tue, 17 Sep 2013 21:11:07 -0400 Received: from mail.windriver.com ([147.11.1.11]:42678 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040Ab3IRBLG (ORCPT ); Tue, 17 Sep 2013 21:11:06 -0400 Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.14.5/8.14.3) with ESMTP id r8I1B3XG001199 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 17 Sep 2013 18:11:03 -0700 (PDT) Received: from lirq-OptiPlex-780.corp.ad.wrs.com (128.224.162.168) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.2.342.3; Tue, 17 Sep 2013 18:11:03 -0700 From: To: CC: Subject: [PATCH] btrfs-progs: Add dependencies explicitly to fix a parallel build issue Date: Wed, 18 Sep 2013 09:11:01 +0800 Message-ID: <1379466661-27973-1-git-send-email-rongqing.li@windriver.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Roy Li The dependencies of "all: version.h" or other similar ones can not fix the parallel build failure, only reduce the times; In fact, many *.o files require version.h file. #grep '#include "version.h"' ./ -r ./btrfs-corrupt-block.c:#include "version.h" ./btrfs.c:#include "version.h" ./btrfs-image.c:#include "version.h" ./cmds-filesystem.c:#include "version.h" ./btrfs-show-super.c:#include "version.h" ./btrfs-select-super.c:#include "version.h" ./cmds-restore.c:#include "version.h" ./btrfs-find-root.c:#include "version.h" ./mkfs.c:#include "version.h" ./btrfs-zero-log.c:#include "version.h" ./btrfs-defrag.c:#include "version.h" ./cmds-chunk.c:#include "version.h" ./btrfstune.c:#include "version.h" ./btrfs-calc-size.c:#include "version.h" ./btrfs-map-logical.c:#include "version.h" ./cmds-check.c:#include "version.h" ./btrfs-debug-tree.c:#include "version.h" Signed-off-by: Roy Li --- Sorry, The patch [btrfs-progs: fix parallel build] sent by me on Sep 3 can not fix the build failure, when build enough times on a 16 core cpu, the build failure happens again, so I refix it again. Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index c43cb68..a7c259c 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,12 @@ endif @echo " [CC] $@" $(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c $< +btrfs-corrupt-block.o btrfs.o btrfs-image.o cmds-filesystem.o:version.h +btrfs-show-super.o btrfs-select-super.o cmds-restore.o:version.h +btrfs-find-root.o mkfs.o btrfs-zero-log.o btrfs-defrag.o cmds-chunk.o:version.h +btrfstune.o btrfs-calc-size.o btrfs-map-logical.o cmds-check.o:version.h +btrfs-debug-tree.o:version.h + %.static.o: %.c @echo " [CC] $@" $(Q)$(CC) $(DEPFLAGS) $(AM_CFLAGS) $(STATIC_CFLAGS) -c $< -o $@