From patchwork Sun Jun 28 19:42:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 489157 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 D5C1B140779 for ; Mon, 29 Jun 2015 05:43:16 +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=OjQWgdNu; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2624AA168A; Sun, 28 Jun 2015 19:43:16 +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 0aqpjFJofKES; Sun, 28 Jun 2015 19:43:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B4B6A9D422; Sun, 28 Jun 2015 19:43:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 65F231C1EFA for ; Sun, 28 Jun 2015 19:43:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5FFBA320E4 for ; Sun, 28 Jun 2015 19:43:00 +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 7BLb6Rcyvspf for ; Sun, 28 Jun 2015 19:42:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by silver.osuosl.org (Postfix) with ESMTPS id 04A9F303D9 for ; Sun, 28 Jun 2015 19:42:59 +0000 (UTC) Received: by wguu7 with SMTP id u7so125248870wgu.3 for ; Sun, 28 Jun 2015 12:42:57 -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=q/B9aOyTK/L/dhWWvQyWF58TU3cc+SF0g07qOTsQSL0=; b=OjQWgdNu7XHtC3CFj/UxJxw2ycLFNeRyO8nM0lkBO4YOAJ9S4MZrnkY4wGj/6yajoK VOGcVo0KyZmWlqua3m+3AgoIS1YrXLTcVL2n+a8iYbo7HsvHNzAGut1a2/Y7/nx8gNpT E9ayy/uIr4+C5xEhqQIJLBjSHMqDgDrS5AM5CQXyebg1qOyjRKzCKvWcQc1FNCMay5Z6 kl1Qdb2UX3+eg0+l/Cvwruk/uSz23FlvFkit0+RE9Fpbx30CFeeXlU87h4D2bstavkZP BRWKbblgrU2Pkf08G2a5sd/+8wkLbk1Sfkcb33/wUYNziMwV5uTBPTrQazAeDNwDTK6U t53w== X-Received: by 10.180.92.162 with SMTP id cn2mr15485243wib.26.1435520577516; Sun, 28 Jun 2015 12:42:57 -0700 (PDT) Received: from beast.localdomain (dynamic-adsl-78-15-144-100.clienti.tiscali.it. [78.15.144.100]) by mx.google.com with ESMTPSA id ex8sm3789243wjc.34.2015.06.28.12.42.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jun 2015 12:42:56 -0700 (PDT) From: Fabio Porcedda To: buildroot@uclibc.org Date: Sun, 28 Jun 2015 21:42:37 +0200 Message-Id: <1435520570-20332-4-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> References: <1435520570-20332-1-git-send-email-fabio.porcedda@gmail.com> Subject: [Buildroot] [RFC v4 03/16] packages/scons: make avaiable the GCC_SYSROOT environment variable 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" In order to support the per-package staging feature, make avaiable the GCC_SYSROOT environment variable to scons packages so the toolchain wrapper can use it. Signed-off-by: Fabio Porcedda --- package/scons/scons.mk | 3 ++- package/scons/site_init.py | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 package/scons/site_init.py diff --git a/package/scons/scons.mk b/package/scons/scons.mk index 39fb258..e8ae086 100644 --- a/package/scons/scons.mk +++ b/package/scons/scons.mk @@ -18,4 +18,5 @@ HOST_SCONS_INSTALL_OPTS = \ $(eval $(host-python-package)) # variables used by other packages -SCONS = $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/scons $(if $(QUIET),-s) +SCONS = $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/scons \ + $(if $(QUIET),-s) --site-dir=$(TOPDIR)/package/scons diff --git a/package/scons/site_init.py b/package/scons/site_init.py new file mode 100644 index 0000000..f0d8b53 --- /dev/null +++ b/package/scons/site_init.py @@ -0,0 +1,19 @@ +""" +Decorate SCons Environment constructor so that the "GCC_SYSROOT" +variable is always included. +""" + +from functools import wraps +import SCons.Environment + +def add_gcc_sysroot(environment_init): + @wraps(environment_init) + def wrapper(self, *args, **kwargs): + environment_init(self, *args, **kwargs) + + self.PrependENVPath('GCC_SYSROOT', os.environ['GCC_SYSROOT']) + + return wrapper + +SCons.Environment.Environment.__init__ = \ + add_gcc_sysroot(SCons.Environment.Environment.__init__)