From patchwork Tue Oct 1 12:55:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 279443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id AFF3D2C00BB for ; Tue, 1 Oct 2013 22:55:18 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DE6138B9BF; Tue, 1 Oct 2013 12:55:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LN9y8nRjL6yS; Tue, 1 Oct 2013 12:55:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC6D08B0D1; Tue, 1 Oct 2013 12:55:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1A31D1BFA70 for ; Tue, 1 Oct 2013 12:55:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 19FBC331EB for ; Tue, 1 Oct 2013 12:55:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BhL3-GDQP5WH for ; Tue, 1 Oct 2013 12:55:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by silver.osuosl.org (Postfix) with ESMTPS id 89B71331E7 for ; Tue, 1 Oct 2013 12:55:14 +0000 (UTC) Received: by mail-pd0-f172.google.com with SMTP id z10so7197410pdj.17 for ; Tue, 01 Oct 2013 05:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L880hbl4P4rpz/xMWygh1ZTVKwxSCsREH+HOHb5HOvs=; b=d2GKF1iol7K23ed8XR0a7qcH/kU1FoY6V/DQAhlYvk67M91emIT7WiwvVEodtI1mjC l4sBZBOmyMowjE0GfKujLPk36wRbkBbwKHY/i4sWLqXauECoqIOTk/PO5o5mpxjIr3i2 /DPnnNCy4qBFgTw85URFyaQA9TmVnsrpPk9mfjbrS9xux3NEG85xbL+5MvzwNPdCd556 wVl05IheqZolhpVepvd8pxROyy7qd4pvf/OCP3OEo7tPApNZ13b1cNFzRHPm4OlVJv24 nU2F5qeQukzRZh83fZt2/+zGi2kH5NYZtq3BCuyiebPn5ms/9IbsLPoAb893Y7fbuV9Z xxUg== X-Received: by 10.68.196.227 with SMTP id ip3mr8441284pbc.163.1380632114284; Tue, 01 Oct 2013 05:55:14 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id b3sm6745804pbh.7.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Oct 2013 05:55:13 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Tue, 1 Oct 2013 14:55:00 +0200 Message-Id: <1380632104-10421-2-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1380632104-10421-1-git-send-email-fabio.porcedda@gmail.com> References: <1380632104-10421-1-git-send-email-fabio.porcedda@gmail.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v6 1/5] package: add toolchain dependency to inner-generic-package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This commit makes the dependency from the target toolchain explicit. This way we can buid from command line a package that use innger-generic-package right after the configuration phase, example: make clean Also remove TARGETS_ALL because the only purpose was to add toolchain dependency so it's superseded by this commit. This is a step forward top-level parallel make. Signed-off-by: Fabio Porcedda --- Makefile | 8 ++------ package/pkg-autotools.mk | 3 ++- package/pkg-generic.mk | 6 +++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6b86541..c31995a 100644 --- a/Makefile +++ b/Makefile @@ -360,7 +360,6 @@ TARGETS+=target-post-image TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS) $(BASE_TARGETS)) TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS)) -TARGETS_ALL:=$(patsubst %,__real_tgt_%,$(TARGETS)) # host-* dependencies have to be handled specially, as those aren't # visible in Kconfig and hence not added to a variable like TARGETS. @@ -383,9 +382,6 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS))) TARGETS_LEGAL_INFO:=$(patsubst %,%-legal-info,\ $(TARGETS) $(BASE_TARGETS) $(TARGETS_HOST_DEPS) $(HOST_DEPS)))) -# all targets depend on the crosscompiler and it's prerequisites -$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % - dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) @@ -398,11 +394,11 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf toolchain: prepare dirs dependencies $(BASE_TARGETS) -world: toolchain $(TARGETS_ALL) +world: $(TARGETS) .PHONY: all world toolchain dirs clean distclean source outputmakefile \ legal-info legal-info-prepare legal-info-clean printvars \ - $(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \ + $(BASE_TARGETS) $(TARGETS) \ $(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) $(TARGETS_LEGAL_INFO) \ $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \ $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index b0eddde..aafa396 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -202,7 +202,8 @@ endef # This must be repeated from inner-generic-package, otherwise we get an empty # _DEPENDENCIES if _AUTORECONF is YES. Also filter the result of _AUTORECONF # away from the non-host rule -$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool $(1),\ +$(2)_DEPENDENCIES ?= $(filter-out host-automake host-autoconf host-libtool \ + host-toolchain $(1),\ $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index bfc4dc1..d7efcd3 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -307,7 +307,11 @@ endif $(2)_REDISTRIBUTE ?= YES -$(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +$(2)_DEPENDENCIES ?= $(filter-out host-toolchain $(1),\ + $(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES)))) +ifeq ($$($(2)_TYPE),target) +$(2)_DEPENDENCIES += toolchain +endif $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO