From patchwork Mon Aug 26 10:33:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 19531 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D14A92469A for ; Mon, 26 Aug 2013 10:33:23 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id f10sf1373311yha.4 for ; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=/6x5LjNEtzvcSpsBiy0GqDdN5tfjgMWCl8Tv4oyP+Q0=; b=e7L0wJuDeWIDvxx3YuccYqmFrr0CQcbKgEDthJI+fxum7Qt5+MFXFt4BXymFvIm93s c8L4qmkmlPkYunD+gTohpRal+FYVEf/PPicAMnsi0YFh0uEoEJMKtB3o9Lrn1wfmGP/k aF2PkKeFoQLPBod6tuPSeDQKtJh0IQqplZognnwvy75HT32YM/gnrKb9Y25RpJGoWgPL Uye+ViQ87BXFNbOCkaze/ox7558AelK0W5r0xcAdUPcSwokpaxnwK9Iqj8QMYemf0l/1 cNUMbuTtFCok+iIi/4G5xgAFSMqcxxDXeEfsraJA9VQn15WI4eEQKSfn8J9S5cWxO2qA 3ndQ== X-Received: by 10.236.108.233 with SMTP id q69mr4904350yhg.11.1377513203633; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.198 with SMTP id gg6ls2346019qeb.89.gmail; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) X-Received: by 10.52.34.40 with SMTP id w8mr12100416vdi.7.1377513203550; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id rl1si3406177vcb.149.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 26 Aug 2013 03:33:23 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id gf12so1870035vcb.36 for ; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) X-Gm-Message-State: ALoCoQmzodYd71yHCbKBHbSdSD0bAjIHEMiSCfGrbP72OxMZKahEWaUFXjDNqdg7w6RSpypj8yKS X-Received: by 10.220.249.67 with SMTP id mj3mr779740vcb.23.1377513203441; Mon, 26 Aug 2013 03:33:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp228272vcz; Mon, 26 Aug 2013 03:33:22 -0700 (PDT) X-Received: by 10.152.87.42 with SMTP id u10mr184743laz.43.1377513201326; Mon, 26 Aug 2013 03:33:21 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id r4si2877430lah.173.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 26 Aug 2013 03:33:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.53 is neither permitted nor denied by best guess record for domain of fathi.boudra@linaro.org) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id el20so2234435lab.12 for ; Mon, 26 Aug 2013 03:33:20 -0700 (PDT) X-Received: by 10.152.116.7 with SMTP id js7mr13263089lab.11.1377513200524; Mon, 26 Aug 2013 03:33:20 -0700 (PDT) Received: from localhost.localdomain (a91-152-78-194.elisa-laajakaista.fi. [91.152.78.194]) by mx.google.com with ESMTPSA id ap7sm5461308lac.10.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 26 Aug 2013 03:33:20 -0700 (PDT) From: Fathi Boudra To: openembedded-devel@lists.openembedded.org Cc: martin.jansa@gmail.com, koen@dominion.thruhere.net, Fathi Boudra , Andrew McDermott Subject: [meta-oe][PATCH 1/3] acpica: fix parallel build Date: Mon, 26 Aug 2013 13:33:13 +0300 Message-Id: <1377513195-21664-2-git-send-email-fathi.boudra@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1377513195-21664-1-git-send-email-fathi.boudra@linaro.org> References: <1377513195-21664-1-git-send-email-fathi.boudra@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: fathi.boudra@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The compilation of the iasl utility fails when `make -j' > 1. This commit cleans up the rules in generate/unix/iasl such that a `make -j' will succeed. Signed-off-by: Andrew McDermott --- meta-oe/recipes-extended/acpica/acpica_20130626.bb | 3 +- .../acpica/files/fix-parallel-build.patch | 80 ++++++++++++++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch diff --git a/meta-oe/recipes-extended/acpica/acpica_20130626.bb b/meta-oe/recipes-extended/acpica/acpica_20130626.bb index 65eadac..bf38fa3 100644 --- a/meta-oe/recipes-extended/acpica/acpica_20130626.bb +++ b/meta-oe/recipes-extended/acpica/acpica_20130626.bb @@ -17,7 +17,8 @@ PR="r1" SRC_URI="https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \ file://cross-compile.patch \ - file://no-werror.patch" + file://no-werror.patch \ + file://fix-parallel-build.patch" SRC_URI[md5sum] = "b7112b3deffef8fe25aac7810cc419a9" SRC_URI[sha256sum] = "888dda6227265c396a686624f971c51693c2bba84f24c634536234c8dca7b465" diff --git a/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch b/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch new file mode 100644 index 0000000..42e3fb1 --- /dev/null +++ b/meta-oe/recipes-extended/acpica/files/fix-parallel-build.patch @@ -0,0 +1,80 @@ +diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile +index e9520ed..1b73d7a 100644 +--- a/generate/unix/iasl/Makefile ++++ b/generate/unix/iasl/Makefile +@@ -212,13 +212,10 @@ INTERMEDIATES = \ + MISC = \ + $(OBJDIR)/aslcompilerparse.h\ + $(OBJDIR)/aslcompiler.y.h\ +- $(OBJDIR)/aslcompilerparse.output\ + $(OBJDIR)/dtparserparse.h\ + $(OBJDIR)/dtparser.y.h\ +- $(OBJDIR)/dtparserparse.output\ + $(OBJDIR)/prparserparse.h\ +- $(OBJDIR)/prparser.y.h\ +- $(OBJDIR)/prparserparse.output ++ $(OBJDIR)/prparser.y.h + + # + # Flags specific to iASL compiler +@@ -240,21 +237,29 @@ include ../Makefile.rules + $(OBJDIR)/aslcompilerlex.c : $(ASL_COMPILER)/aslcompiler.l $(ASL_COMPILER)/aslsupport.l + $(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l + +-$(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompilerparse.h : $(ASL_COMPILER)/aslcompiler.y ++$(OBJDIR)/aslcompilerparse.c : $(ASL_COMPILER)/aslcompiler.y + $(YACC) $(YFLAGS) -pAslCompiler -o$@ $? + + $(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l + $(LEX) $(LFLAGS) -PDtParser -o$@ $? + +-$(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparserparse.h : $(ASL_COMPILER)/dtparser.y ++$(OBJDIR)/dtparserparse.c : $(ASL_COMPILER)/dtparser.y + $(YACC) $(YFLAGS) -pDtParser -o$@ $? + + $(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l + $(LEX) $(LFLAGS) -PPrParser -o$@ $? + +-$(OBJDIR)/prparserparse.c $(OBJDIR)/prparserparse.h : $(ASL_COMPILER)/prparser.y ++$(OBJDIR)/prparserparse.c : $(ASL_COMPILER)/prparser.y + $(YACC) $(YFLAGS) -pPrParser -o$@ $? + ++$(OBJDIR)/aslcompilerparse.h : $(OBJDIR)/aslcompilerparse.c ++ touch $@ ++ ++$(OBJDIR)/dtparserparse.h : $(OBJDIR)/dtparserparse.c ++ touch $@ ++ ++$(OBJDIR)/prparserparse.h: $(OBJDIR)/prparserparse.c ++ touch $@ + + # + # Rename the headers produced by bison/yacc +@@ -279,19 +284,21 @@ $(OBJDIR)/prparser.y.h: $(OBJDIR)/prparserparse.h + # by the utilities above and they are not necessarily ANSI C, etc. + # + $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< + + $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c +- $(CC) -c $(CFLAGS) -Wall -o$@ $? ++ $(CC) -c $(CFLAGS) -Wall -o$@ $< ++ ++$(OBJECTS): $(HEADERS)