From patchwork Mon Apr 18 09:23:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Izard X-Patchwork-Id: 611621 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3qpN473c9fz9t3w for ; Mon, 18 Apr 2016 19:23:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=PwL/vjK4; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 34D678933F; Mon, 18 Apr 2016 09:23:34 +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 zeiPhaLMMFF5; Mon, 18 Apr 2016 09:23:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1E00688B37; Mon, 18 Apr 2016 09:23:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 731251C1510 for ; Mon, 18 Apr 2016 09:23:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6E7B695DDB for ; Mon, 18 Apr 2016 09:23:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LedVZiG0ZQzx for ; Mon, 18 Apr 2016 09:23:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id AD8CF95DC0 for ; Mon, 18 Apr 2016 09:23:29 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id a140so22843069wma.2 for ; Mon, 18 Apr 2016 02:23:29 -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=hfRt53pQ674iKlhUvXISob3e05JC0UU5gtfW0BtoEWQ=; b=PwL/vjK42vgP8h0NVdGEisG7PjnMscoRs3JREB9cjbRlACuS+ruyZXYjF6V5DmWzor W6h/9fJzs0vND2aENp3OA4X5hrc1yPu3AyVwPn5wFuZf/g+2YqfJyBym9iDMWfUUO9G2 c5SHJKoLD6nWQMHWCr8n2fUTloO5zXpqlnc7lv7H8RRDnt3CWA92G+SBNa3myVO0aDPW sjOM6pDKYvbAgTSS2+O6mP9ideLYaGtVlFOTJ0DA/JnixMxtA+sTfd0EMVhOUIrzccPS we5oBgNoeG7ip6ND9UmxDxMr0FUqHIFAeY0ucW57/o3nLk9XlJHDUdEQQHD42w3Yy9Fr HJMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hfRt53pQ674iKlhUvXISob3e05JC0UU5gtfW0BtoEWQ=; b=CVL4Lmo3BfdffZ+Iem9x2vUzQJWyj/RDz9RJySunFc2pe3qI7eWlOpbrjXUDaFJxFu lyQKPWXAjTaoSQDWi7TneiFw6g6l3L+vpyegm/a645OGGRrP9pi6MEusKDqxaUiUVgWm hOKUqwsJhXVrhQtY8znDjn/GFh/DMp0vaGftNOpHMa19ySDKVJcbUQDMUrECV7aAX+KL EYB9DtUTE1aRNyP94DtXnXpLPLj3Zc0rBiB2LhQbaAm0ET77Ss1z97+fj97HDyfIt/tL 1AHxV8MI1iEPDMNts/ofUACAE1NbpPAWtnapjPO1CMd0yRBSANxEey6zhoNYg7sCbVEZ xW7w== X-Gm-Message-State: AOPr4FVk4e82iAMwy/owGiJBdrp46YzgcK9I1NmbRCYQdMIMvdD6k2hqWhWnj+fZiHfIBw== X-Received: by 10.194.176.129 with SMTP id ci1mr33923356wjc.166.1460971408319; Mon, 18 Apr 2016 02:23:28 -0700 (PDT) Received: from localhost.localdomain (ram94-11-88-187-113-157.fbx.proxad.net. [88.187.113.157]) by smtp.gmail.com with ESMTPSA id r204sm36812871wmg.20.2016.04.18.02.23.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 02:23:27 -0700 (PDT) From: Romain Izard To: buildroot@buildroot.org Date: Mon, 18 Apr 2016 11:23:01 +0200 Message-Id: <1460971383-10595-2-git-send-email-romain.izard.pro@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460971383-10595-1-git-send-email-romain.izard.pro@gmail.com> References: <1460971383-10595-1-git-send-email-romain.izard.pro@gmail.com> Cc: Thomas Petazzoni , Romain Izard , "Yann E. MORIN" Subject: [Buildroot] [PATCH v4 1/3] core/pkg-kconfig: Factorize make commands X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Use a variable to factorize the calls to make, as we use the same set of options multiple times. Signed-off-by: Romain Izard Reviewed-by: "Yann E. MORIN" --- Changelog: v3: new v4: fix commit message package/pkg-kconfig.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 94ec3cc..cb177bb 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -57,6 +57,9 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch fi; \ done +$(2)_KCONFIG_MAKE = \ + $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS) + # The specified source configuration file and any additional configuration file # fragments are merged together to .config, after the package has been patched. # Since the file could be a defconfig file it needs to be expanded to a @@ -64,13 +67,11 @@ $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch # done even when the package does not support defconfigs. $$($(2)_DIR)/.config: $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) $$($(2)_KCONFIG_DEFCONFIG), \ + $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \ cp $$($(2)_KCONFIG_FILE) $$(@)) $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) oldconfig + $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig # If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is # already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add @@ -81,8 +82,7 @@ $$($(2)_DIR)/.config: | $(1)-patch # The exact rules are specified by the package .mk file. define $(2)_FIXUP_DOT_CONFIG $$($(2)_KCONFIG_FIXUP_CMDS) - $$(Q)yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) oldconfig + $$(Q)yes "" | $$($(2)_KCONFIG_MAKE) oldconfig $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done endef