mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-03 02:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

python-native: update from OE and fix build after staging layout change

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4970 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
2008-07-28 15:13:20 +00:00
parent c4d370a0c7
commit cc33fc00cf
3 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta-extras/packages/python/python-native-2.5.1/catchup-with-swig.patch vendored Normal file
View File

@@ -0,0 +1,13 @@
Index: Python-2.5.1/Lib/distutils/command/build_ext.py
===================================================================
--- Python-2.5.1.orig/Lib/distutils/command/build_ext.py
+++ Python-2.5.1/Lib/distutils/command/build_ext.py
@@ -513,7 +513,7 @@ class build_ext (Command):
target_lang=language)
- def swig_sources (self, sources, extension):
+ def swig_sources (self, sources, extension=None):
"""Walk the list of source files in 'sources', looking for SWIG
interface (.i) files. Run SWIG on all that are found, and

38
meta-extras/packages/python/python-native-2.5.1/fix-staging.patch vendored Normal file
View File

@@ -0,0 +1,38 @@
---
Lib/distutils/sysconfig.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- Python-2.5.1.orig/Lib/distutils/sysconfig.py
+++ Python-2.5.1/Lib/distutils/sysconfig.py
@@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref
If 'prefix' is supplied, use it instead of sys.prefix or
sys.exec_prefix -- i.e., ignore 'plat_specific'.
"""
if prefix is None:
- prefix = plat_specific and EXEC_PREFIX or PREFIX
+ if plat_specific:
+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include')
+ else:
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
if python_build:
base = os.path.dirname(os.path.abspath(sys.executable))
if plat_specific:
inc_dir = base
@@ -94,11 +97,14 @@ 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'.
"""
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')
+ else:
+ prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
libpython = os.path.join(prefix,
"lib", "python" + get_python_version())
if standard_lib: