[oe-commits] Chris Larson : conf/build: darwin fixups - COMMAND_MODE, -m32, PATH

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 39fae5b646fb7a49aa14edc989633e47343f26dc
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=39fae5b646fb7a49aa14edc989633e47343f26dc

Author: Chris Larson <chris_larson at mentor.com>
Date:   Thu Oct 21 14:55:05 2010 -0700

conf/build: darwin fixups - COMMAND_MODE, -m32, PATH

- For ppc darwin, use the wrapper scripts
- For i386 darwin, set -m32, as uname shows i386 even on 64 bit darwin
- For i386 and ppc darwin, set COMMAND_MODE to fix incompatible shell utility
  behavior, for example 'echo' not handling -n as expected

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 conf/build/Power Macintosh-darwin.conf |    5 ++++-
 conf/build/darwin/utilities.inc        |    9 +++++++++
 conf/build/i386-darwin.conf            |    3 +++
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/conf/build/Power Macintosh-darwin.conf b/conf/build/Power Macintosh-darwin.conf
index f56c092..effddbf 100644
--- a/conf/build/Power Macintosh-darwin.conf	
+++ b/conf/build/Power Macintosh-darwin.conf	
@@ -1 +1,4 @@
-BUILD_ARCH="powerpc"
+PATH =. "${@bb.which('${BBPATH}', 'bin')}:"
+BUILD_ARCH = "powerpc"
+
+require conf/build/darwin/utilities.inc
diff --git a/conf/build/darwin/utilities.inc b/conf/build/darwin/utilities.inc
new file mode 100644
index 0000000..9497524
--- /dev/null
+++ b/conf/build/darwin/utilities.inc
@@ -0,0 +1,9 @@
+python darwin_utilities_fixup() {
+    import os
+    import bb.event
+
+    if isinstance(e, bb.event.ConfigParsed):
+        os.environ["COMMAND_MODE"] = "legacy"
+}
+
+addhandler darwin_utilities_fixup
diff --git a/conf/build/i386-darwin.conf b/conf/build/i386-darwin.conf
index e7ca06c..c9e81b9 100644
--- a/conf/build/i386-darwin.conf
+++ b/conf/build/i386-darwin.conf
@@ -1 +1,4 @@
 PATH =. "${@bb.which('${BBPATH}', 'bin')}:"
+BUILD_CC_ARCH += "-m32"
+
+require conf/build/darwin/utilities.inc