[oe-commits] Yu Ke : python-native: fix for non /usr/lib libdir case
git version control
git at git.openembedded.org
Tue Jul 12 14:00:22 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: ab4ae436126f20b404375c9ae77cf66cfe31ea34
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ab4ae436126f20b404375c9ae77cf66cfe31ea34
Author: Yu Ke <ke.yu at intel.com>
Date: Mon Jul 11 15:23:18 2011 +0800
python-native: fix for non /usr/lib libdir case
the get_python_lib() use hard code "lib". when other recipe
building use python-native, the STAGING_LIBDIR is non /usr/lib,
so the hard code "lib" will break the build
This patch replace the hardcoded "lib" with value from libdir
to fix this issue.
Signed-off-by: Yu Ke <ke.yu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
...2-distutils-prefix-is-inside-staging-area.patch | 15 +++++++++++----
.../recipes-devtools/python/python-native_2.6.6.bb | 2 +-
2 files changed, 12 insertions(+), 5 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 9532eb3..8e721fe 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,19 +30,26 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py
if os.name == "posix":
if python_build:
-@@ -116,7 +119,10 @@ def get_python_lib(plat_specific=0, stan
+@@ -115,12 +118,16 @@ def get_python_lib(plat_specific=0, stan
+ 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]
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')
++ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip(lib_basename)
+ else:
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
libpython = os.path.join(prefix,
-@@ -216,7 +222,7 @@ def get_config_h_filename():
+- "lib", "python" + get_python_version())
++ lib_basename, "python" + get_python_version())
+ if standard_lib:
+ return libpython
+ else:
+@@ -216,7 +223,7 @@ def get_config_h_filename():
else:
# The name of the config.h file changed in 2.2
config_h = 'pyconfig.h'
@@ -51,7 +58,7 @@ Index: Python-2.6.6/Lib/distutils/sysconfig.py
def get_makefile_filename():
-@@ -225,7 +231,7 @@ def get_makefile_filename():
+@@ -225,7 +232,7 @@ def get_makefile_filename():
return os.path.join(os.path.dirname(os.path.realpath(sys.executable)),
"Makefile")
lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
diff --git a/meta/recipes-devtools/python/python-native_2.6.6.bb b/meta/recipes-devtools/python/python-native_2.6.6.bb
index 0f9ae10..fa943f4 100644
--- a/meta/recipes-devtools/python/python-native_2.6.6.bb
+++ b/meta/recipes-devtools/python/python-native_2.6.6.bb
@@ -1,6 +1,6 @@
require python.inc
DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
More information about the Openembedded-commits
mailing list