From patchwork Tue Sep 10 07:46:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 273971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C28242C00E2 for ; Wed, 11 Sep 2013 04:15:26 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B9DE88E873; Tue, 10 Sep 2013 18:15:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZN2iVpaF+wnz; Tue, 10 Sep 2013 18:15:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A398C90E3E; Tue, 10 Sep 2013 18:01:30 +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 725B31BF966 for ; Tue, 10 Sep 2013 08:08:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 23A8821F5E for ; Tue, 10 Sep 2013 08:08:40 +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 f91K5Yu7IVvi for ; Tue, 10 Sep 2013 08:08:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f48.google.com (mail-pb0-f48.google.com [209.85.160.48]) by silver.osuosl.org (Postfix) with ESMTPS id 67B8726DDB for ; Tue, 10 Sep 2013 08:08:38 +0000 (UTC) Received: by mail-pb0-f48.google.com with SMTP id ma3so7225107pbc.35 for ; Tue, 10 Sep 2013 01:08:50 -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=JBHWOJ0bAFi2k21SCA6+0rq4bMwmkixiHhjR2sNAH4s=; b=ZIdzE9oxhZm5KTN3rJ0qQvME6wFTdeL9Anw5two3DKoKRXAdh3n8oHzfxpIC7yXtoA BKHaKNYefTRo59UC0qE5eHzzJ3eglXI8UVQm1dgtIV8Ki8Yb0Ynr3pvmsLoAAR/0DtFb v6B2zPDkUnNWf7kyWx7XS3CeMQrDECWESFG4CCZipQMX9lX9W8NRGH0ruNHA6fQQ6aF1 eZLMRtn5G2hXtO+YpR6REOjM1ATyzg9hdxx9RyDx1TwVGghz0mOTD2mkNTtnWErMsH5b ylLCK6WVyP+RjufExXUSJVyQ1o2a6rWSzeJ2NxPgFApP1CqH52eRf2kdViaa8tnazvSN rPhA== X-Received: by 10.66.118.204 with SMTP id ko12mr162530pab.184.1378799175668; Tue, 10 Sep 2013 00:46:15 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id xl3sm21162817pbb.17.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Sep 2013 00:46:14 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Tue, 10 Sep 2013 09:46:04 +0200 Message-Id: <1378799164-28645-4-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1378799164-28645-1-git-send-email-fabio.porcedda@gmail.com> References: <1378799164-28645-1-git-send-email-fabio.porcedda@gmail.com> Subject: [Buildroot] [PATCH v3 3/3] 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 This is a step forward top-level parallel make. Signed-off-by: Fabio Porcedda --- Makefile | 2 +- package/pkg-autotools.mk | 3 ++- package/pkg-generic.mk | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 485d0a4..5ed3d60 100644 --- a/Makefile +++ b/Makefile @@ -397,7 +397,7 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf toolchain: prepare dirs dependencies $(BASE_TARGETS) -world: toolchain $(TARGETS_ALL) +world: $(TARGETS_ALL) .PHONY: all world toolchain dirs clean distclean source outputmakefile \ legal-info legal-info-prepare legal-info-clean printvars \ 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 5ea41ff..e511833 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)_BUILD_DEPENDENCIES ?= $(2)_INSTALL_STAGING ?= NO