From patchwork Tue Dec 9 10:47:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Szakmeister X-Patchwork-Id: 419002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 76E4014009B for ; Tue, 9 Dec 2014 21:50:01 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EE64C28C07E; Tue, 9 Dec 2014 11:48:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id E816628C03E for ; Tue, 9 Dec 2014 11:47:51 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-qc0-f175.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-qc0-f175.google.com (mail-qc0-f175.google.com [209.85.216.175]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 9 Dec 2014 11:47:49 +0100 (CET) Received: by mail-qc0-f175.google.com with SMTP id b13so193801qcw.20 for ; Tue, 09 Dec 2014 02:49:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=egtE+JlfE5ED01MJgBdKTnYVcxVzzBOteL7yo3Xus+E=; b=dl2V3dNgdAG/e6wGWSH+1LWJ+E6aNaJGAA9wcPjR1lJgMXWPkLESzm0T22wJgxnxV+ F4CUilK5Lx53KOhiV6G7f9uPd2fz6Gqf/O3dtvPV1UscYk+rM5Ndj2M07I0rh5+qCbeL 5VIO+3QTZymM7D8dLz0PiXGE3qkspNx86IZGBQL1xyOQQNgpxqdXRZDKv8HEiJMKPyx4 nyA0vyWGARv0l3/qNnugMJU/J/IRzVcEaAjn9eYGtuEuYsNMuxzORxktsglvOqZaLyKt ZzhS5rZxgYSlTaYhpgeqDKnOBm/u2J4qtny1s8CHcr60AzQ0jzWPYBGwfL1GX0/THCZw 0sKA== X-Received: by 10.224.131.135 with SMTP id x7mr4109885qas.38.1418122172345; Tue, 09 Dec 2014 02:49:32 -0800 (PST) Received: from pangolin.intelesys.local (74-92-144-137-WashingtonDC.hfc.comcastbusiness.net. [74.92.144.137]) by mx.google.com with ESMTPSA id a9sm735943qgf.7.2014.12.09.02.49.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Dec 2014 02:49:31 -0800 (PST) From: John Szakmeister To: openwrt-devel@lists.openwrt.org Date: Tue, 9 Dec 2014 05:47:35 -0500 Message-Id: <1418122055-5917-1-git-send-email-john@szakmeister.net> X-Mailer: git-send-email 2.1.1 Subject: [OpenWrt-Devel] [PATCH][RESEND] [tools] toolchain: ensure tools are built and staged before preparing toolchain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This fixes an issue where the toolchain/prepare step could run, but some of the necessary host tools might be missing. Signed-off-by: John Szakmeister --- This is a resend of a patch I sent earlier (https://lists.openwrt.org/pipermail/openwrt-devel/2014-October/028422.html). I didn't receive any feedback, but it has enabled me to build correctly with a parallel build. Makefile | 2 +- toolchain/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91b6946..edb75fd 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ else include tools/Makefile include toolchain/Makefile -$(toolchain/stamp-install): $(tools/stamp-install) +$(toolchain/stamp-prepare): $(tools/stamp-install) $(target/stamp-compile): $(toolchain/stamp-install) $(tools/stamp-install) $(BUILD_DIR)/.prepared $(package/stamp-compile): $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-install): $(package/stamp-compile) diff --git a/toolchain/Makefile b/toolchain/Makefile index 36c6ed3..b260a36 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -82,6 +82,10 @@ ifndef DUMP_TARGET_DB $(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed: endif +$(eval $(call stampfile,$(curdir),toolchain,prepare)) $(eval $(call stampfile,$(curdir),toolchain,install,$(TOOLCHAIN_DIR)/stamp/.gcc-initial_installed,,$(TOOLCHAIN_DIR))) + +$($(curdir)/stamp-install): $($(curdir)/stamp-prepare) + $(eval $(call subdir,$(curdir)))