From: Christopher Larson <chris_larson@mentor.com>
Date: Sat, 30 Apr 2016 19:43:52 +0000 (-0700)
Subject: bitbake: bb.build: handle __builtins__ as a module
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d2d3121880d65e52cdffe6b6f869aa3f2dd6410;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: bb.build: handle __builtins__ as a module

Fixes pypy support.

(Bitbake rev: e90cfc655affeec8f5519f7078dad5f99db3c461)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index db5072cb4d7..a5b99edb7bc 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -61,8 +61,13 @@ def reset_cache():
 # in all namespaces, hence we add them to __builtins__.
 # If we do not do this and use the exec globals, they will
 # not be available to subfunctions.
-__builtins__['bb'] = bb
-__builtins__['os'] = os
+if hasattr(__builtins__, '__setitem__'):
+    builtins = __builtins__
+else:
+    builtins = __builtins__.__dict__
+
+builtins['bb'] = bb
+builtins['os'] = os
 
 class FuncFailed(Exception):
     def __init__(self, name = None, logfile = None):