summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/python
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:44:47 +0000
commit2edc929c47ac90eabad74e3726912fb3a57aaecd (patch)
tree633584feaef7171392029f9d5bac7e933476aa8d /meta/recipes-devtools/python
parent744ff417fc0b4ef3096cf5f687f7e3bda20c694e (diff)
downloadopenembedded-core-2edc929c47ac90eabad74e3726912fb3a57aaecd.tar.gz
openembedded-core-2edc929c47ac90eabad74e3726912fb3a57aaecd.tar.bz2
openembedded-core-2edc929c47ac90eabad74e3726912fb3a57aaecd.tar.xz
openembedded-core-2edc929c47ac90eabad74e3726912fb3a57aaecd.zip
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. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/recipes-devtools/python')
-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 b46caf64f..f89aaff7b 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]
If 'prefix' is supplied, use it instead of sys.prefix or
sys.exec_prefix -- i.e., ignore 'plat_specific'.
"""
-+ lib_basename = os.getenv("libdir").split('/')[-1]
++ lib_basename = os.environ['STAGING_LIBDIR'].split('/')[-1]
if prefix is None:
- prefix = plat_specific and EXEC_PREFIX or PREFIX
+ if plat_specific:
-+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
++ prefix = os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
+ else:
-+ prefix = plat_specific and EXEC_PREFIX or PREFIX
++ prefix = PREFIX
if os.name == "posix":
libpython = os.path.join(prefix,