From patchwork Thu Mar 14 18:44:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 227782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 2635C2C00C6 for ; Fri, 15 Mar 2013 05:44:26 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DEA593177C; Thu, 14 Mar 2013 18:44:24 +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 dxot12tLE1oA; Thu, 14 Mar 2013 18:44:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1CBCC31782; Thu, 14 Mar 2013 18:44:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D42088F75E for ; Thu, 14 Mar 2013 18:44:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A63D8AC00 for ; Thu, 14 Mar 2013 18:44:21 +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 ystD0tE7NUq9 for ; Thu, 14 Mar 2013 18:44:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 002BF8901A for ; Thu, 14 Mar 2013 18:44:19 +0000 (UTC) Received: by mail-wg0-f43.google.com with SMTP id e12so1959046wge.34 for ; Thu, 14 Mar 2013 11:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=1NHaaLXJzT3sNAlk854B0McHz+emqwXkmPi+yCSjPD4=; b=dq8bE5RgeFNWgkZVIlmJRc4IF1dCCajcOmpTu56mtgy1G4BOD4XQZC3IZx+ecuVcPw nv9V7uE8PsjfPZXnVK53hxvyPBoT7R/f/stCf6fNXB5lQetCZrCUcP/VMu/9a0cn18MT rTAGGEMMI9srEvxB8hii+MnepLtfcIjU4iSn9tCHL4MoS2aqD5LBGnqROat5aYwYpTQ4 rWbmki1ddXJxD8gMm5pquRp0pB0DxjHhlab4tbtYr6MsNA2JFO8zqRMJyfQ2jS3GoPv+ xJ4k17vVoh4VDOoNJHrFpaOAhKPhv4HpCuMSEve0tHmOa82yNJjM/duzl6rHLXuyDuUf lwXg== X-Received: by 10.194.82.34 with SMTP id f2mr6387137wjy.25.1363286658450; Thu, 14 Mar 2013 11:44:18 -0700 (PDT) Received: from localhost.localdomain (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPS id eo1sm10648285wib.8.2013.03.14.11.44.16 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 11:44:17 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Thu, 14 Mar 2013 19:44:10 +0100 Message-Id: <1363286650-11208-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH] toolchain/crosstool-NG: do not depend on the top-level Buildroot's .config 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 Previously, the crosstool-NG backend did depend on the top-level Buildroot's .config to detect changes in the toolchain options, using a tentatively-clever heuristic, which also included the full Buildroot's version string to push down to set the components' versions strings. In doing so, any commit in the Buildroot tree would imply a complete rebuild of the toolchain, even in the case the toolchain options did not change, thus being a large annoyance (to say the least). As Buildroot never guaranteed that toolchain options would be detected, even less handled, and that the internal backend does neither detect nor act on toolchain options changes, and delegate that to the user, there is no point in individualising the crosstool-NG backend's behaviour. So, just drop the not-so-clever heuristic, and just build the toolchain once, leaving to the user the responsibility to explictly ask Buildroot to rebuild it. Reported-by: "Przemyslaw Wrzos" Signed-off-by: "Yann E. MORIN" Cc: "Przemyslaw Wrzos" Cc: Thomas Petazzoni --- toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk index 6554982..9d503b0 100644 --- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk +++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk @@ -362,16 +362,13 @@ endef $(CTNG_DIR)/.config: | host-crosstool-ng # Default configuration -# Depends on top-level .config because it has options we have to shoe-horn -# into crosstool-NG's .config # Only copy the original .config file if we don't have one already. # Check that given config file matches selected C library. # We need to call oldconfig twice in a row to ensure the options # are correctly set ( eg. if an option is new, then the initial sed # can't do anything about it ) Ideally, this should go in oldconfig # itself, but it's much easier to handle here. - -$(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(BUILDROOT_CONFIG) +$(CTNG_DIR)/.config: $(Q)if [ ! -f $@ ]; then \ mkdir -p "$(CTNG_DIR)"; \ libc="$$(awk -F '"' '$$1=="CT_LIBC=" { print $$2; }' "$<")"; \ @@ -383,11 +380,8 @@ $(CTNG_DIR)/.config: $(CTNG_CONFIG_FILE) $(BUILDROOT_CONFIG) fi; \ cp -f $< $@; \ fi - $(Q)cp -a $@ $@.timestamp $(call ctng-oldconfig,$@) $(call ctng-oldconfig,$@) - $(call ctng-check-config-changed,$@,$@.timestamp) - $(Q)rm -f $@.timestamp # Manual configuration ctng-menuconfig: $(CTNG_DIR)/.config