[oe-commits] Andreas Oberritter : python-native: distutils: don't use libdir, remove dead code path
git at git.openembedded.org
git at git.openembedded.org
Tue Mar 13 11:48:22 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 2edc929c47ac90eabad74e3726912fb3a57aaecd
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2edc929c47ac90eabad74e3726912fb3a57aaecd
Author: Andreas Oberritter <obi at opendreambox.org>
Date: Mon Mar 12 22:24:11 2012 +0100
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 at opendreambox.org>
---
...2-distutils-prefix-is-inside-staging-area.patch | 6 +++---
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 b46caf6..f89aaff 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,
More information about the Openembedded-commits
mailing list