summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-12 22:24:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 11:45:13 +0000
commit9ff71c3b4524daee70b664aaeafb864ea532703f (patch)
tree3c79f7579f7bf07f5abbeb4f26702695bada5921 /meta/recipes-devtools
parent475ecc54dbfcdd6ce62c6b06c1831931c6ba3414 (diff)
downloadpoky-9ff71c3b4524daee70b664aaeafb864ea532703f.tar.gz
python-native: distutils: don't use libdir, remove dead code path
* Coming from OE-classic it was surprising that python-native now requires 'libdir' to be exported. Otherwise autoconf would fail to detect python libraries. This happend using a customized environment setup script to use OE's compiler and libs without bitbake. * Use STAGING_LIBDIR instead of libdir. * While at it, remove redundant 'and' statments. (From OE-Core rev: 2edc929c47ac90eabad74e3726912fb3a57aaecd) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
index b46caf64fe..f89aaff7b1 100644
--- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-staging-area.patch
@@ -30,13 +30,13 @@ Upstream-Status: Inappropriate [embedded specific]
30 If 'prefix' is supplied, use it instead of sys.prefix or 30 If 'prefix' is supplied, use it instead of sys.prefix or
31 sys.exec_prefix -- i.e., ignore 'plat_specific'. 31 sys.exec_prefix -- i.e., ignore 'plat_specific'.
32 """ 32 """
33+ lib_basename = os.getenv("libdir").split('/')[-1] 33+ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
34 if prefix is None: 34 if prefix is None:
35- prefix = plat_specific and EXEC_PREFIX or PREFIX 35- prefix = plat_specific and EXEC_PREFIX or PREFIX
36+ if plat_specific: 36+ if plat_specific:
37+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename) 37+ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
38+ else: 38+ else:
39+ prefix = plat_specific and EXEC_PREFIX or PREFIX 39+ prefix = PREFIX
40 40
41 if os.name == "posix": 41 if os.name == "posix":
42 libpython = os.path.join(prefix, 42 libpython = os.path.join(prefix,