From patchwork Sun Oct 21 15:27:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193014 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 5AFAB2C0080 for ; Mon, 22 Oct 2012 02:28:02 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 2972D3FC31 for ; Sun, 21 Oct 2012 17:28:01 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by hugin.dotsrc.org (Postfix) with ESMTPS id 4211E3FBAE for ; Sun, 21 Oct 2012 17:27:58 +0200 (CEST) Received: by mail-we0-f179.google.com with SMTP id z49so956617wey.10 for ; Sun, 21 Oct 2012 08:27:58 -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:x-mailer:in-reply-to:references; bh=YSJulOR0k2Sjk7pQP4EyNG7mPyNhe0dBR9fVsb387gE=; b=VstU2cz4tGkxY6XYdfY72aMJLFlAUGeTUsWcEGGfX7MbVHrO7T1E2xSfcLiCZcyIFw sKGQTo3yjPdj1/OcmQm2XrPQmgAEcdBBUwVIiS9MN3aXz5QC0DoDYR8V8aK+TIP8Du3/ q1nxXKVkyrYXKcLeGGe2WOWuJAFmR84KT0Jatr21odR3BOkbRLu/XS32IrGtc/NIuMm5 vwthQ36VYL64N4DNGyPf1G21f+XmQXMHBJ38NPI2Iuo3vMCxVk+y15QWOz71ODgOXAYi Ffy732CgrM669/NWtshmoQ3PYJo+mUAa93iri4sDBkRuv2EBaMQoBI8lIbO7MrV/UAPj ASFQ== Received: by 10.216.204.72 with SMTP id g50mr3947510weo.142.1350833278037; Sun, 21 Oct 2012 08:27:58 -0700 (PDT) Received: from localhost.localdomain (dom38-1-82-236-154-183.fbx.proxad.net. [82.236.154.183]) by mx.google.com with ESMTPS id gg4sm16470282wib.6.2012.10.21.08.27.56 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:27:57 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 08/18] Force somes env variables when use python process run and use DYLD_LIBRARY_PATH for darwin build machine Date: Sun, 21 Oct 2012 17:27:31 +0200 Message-Id: <1350833261-8401-8-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350833261-8401-1-git-send-email-diorcet.yann@gmail.com> References: <1350833261-8401-1-git-send-email-diorcet.yann@gmail.com> Cc: Yann Diorcet X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Yann Diorcet Force few env variables. On darwin the commands fail if this variables are not set --- lib/oelite/fetch/fetch.py | 8 ++++---- lib/oelite/function.py | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/oelite/fetch/fetch.py b/lib/oelite/fetch/fetch.py index 31bc037..135de09 100644 --- a/lib/oelite/fetch/fetch.py +++ b/lib/oelite/fetch/fetch.py @@ -263,7 +263,7 @@ class OEliteUri: finally: if cwd: os.chdir(cwd) - rc = oe.process.run(cmd) + rc = oe.process.run(cmd, None, env = {"PWD": d.get("PWD"), "PATH" : d.get("PATH")}) return rc == 0 def srcpath(self, d): @@ -286,8 +286,8 @@ class OEliteUri: with open("%s/series"%(d.get("PATCHDIR")), "a") as series: series.write("%s -p%s\n"%( self.patchpath(d), self.params["striplevel"])) - - rc = oe.process.run("quilt -v --quiltrc %s push"%(d.get("QUILTRC"))) + + rc = oe.process.run("quilt -v --quiltrc %s push"%(d.get("QUILTRC")), None, env = {"PWD": d.get("PWD"), "PATH" : d.get("PATH")}) if rc != 0: # FIXME: proper error handling raise Exception("quilt push failed: %d"%(rc)) @@ -306,7 +306,7 @@ def patch_init(d): os.chdir(s) if os.path.exists(".pc"): while os.path.exists(".pc/applied-patches"): - rc = oe.process.run("quilt -v --quiltrc %s pop"%(quiltrc)) + rc = oe.process.run("quilt -v --quiltrc %s pop"%(quiltrc), None, env = {"PATH" : d.get("PATH")}) if rc != 0: # FIXME: proper error handling raise Exception("quilt pop failed") diff --git a/lib/oelite/function.py b/lib/oelite/function.py index 10b1e73..a835631 100644 --- a/lib/oelite/function.py +++ b/lib/oelite/function.py @@ -172,12 +172,15 @@ class ShellFunction(OEliteFunction): runfile.write("set -x\n") ld_library_path = self.meta.get("LD_LIBRARY_PATH") flags = self.meta.get_flags("LD_LIBRARY_PATH") + ld_library_path_var = "LD_LIBRARY_PATH" + if self.meta.get("BUILD_OS") == "darwin": + ld_library_path_var = "DYLD_LIBRARY_PATH" if self.ld_library_path: # Prepend already existing content of LD_LIBRARY_PATH only if its set - runfile.write("if [ $LD_LIBRARY_PATH ]; then \ - export LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:" + self.ld_library_path + "\" ;\ + runfile.write("if [ $" + ld_library_path_var + " ]; then \ + export " + ld_library_path_var + "=\"$" + ld_library_path_var + ":" + self.ld_library_path + "\" ;\ else \ - export LD_LIBRARY_PATH=\"" + self.ld_library_path + "\" ;\ + export " + ld_library_path_var + "=\"" + self.ld_library_path + "\" ;\ fi\n") runfile.write("cd %s\n"%(os.getcwd())) runfile.write("%s\n"%(self.name)) @@ -187,5 +190,5 @@ class ShellFunction(OEliteFunction): if self.meta.get_flag(self.name, "fakeroot"): cmd = "%s "%(self.meta.get("FAKEROOT") or "fakeroot") + cmd cmd = "LC_ALL=C " + cmd - rc = oe.process.run(cmd) + rc = oe.process.run(cmd, None, env = {"PWD": self.meta.get("PWD"), "PATH" : self.meta.get("PATH")}) return rc == 0