diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-28 15:13:20 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-07-28 15:13:20 +0000 |
commit | cc33fc00cf639e50c219fcc9cb540101fcae4ad7 (patch) | |
tree | 5c9bd9d0c4f51c311bb7d038599db38f33aecf4a /meta-extras/packages/python/python-native-2.5.1/fix-staging.patch | |
parent | c4d370a0c788caacc4fff27d5dda712169c4fe78 (diff) | |
download | poky-cc33fc00cf639e50c219fcc9cb540101fcae4ad7.tar.gz |
python-native: update from OE and fix build after staging layout change
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4970 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-extras/packages/python/python-native-2.5.1/fix-staging.patch')
-rw-r--r-- | meta-extras/packages/python/python-native-2.5.1/fix-staging.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-extras/packages/python/python-native-2.5.1/fix-staging.patch b/meta-extras/packages/python/python-native-2.5.1/fix-staging.patch new file mode 100644 index 0000000000..087c813fd4 --- /dev/null +++ b/meta-extras/packages/python/python-native-2.5.1/fix-staging.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | --- | ||
2 | Lib/distutils/sysconfig.py | 10 ++++++++-- | ||
3 | 1 file changed, 8 insertions(+), 2 deletions(-) | ||
4 | |||
5 | --- Python-2.5.1.orig/Lib/distutils/sysconfig.py | ||
6 | +++ Python-2.5.1/Lib/distutils/sysconfig.py | ||
7 | @@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref | ||
8 | |||
9 | If 'prefix' is supplied, use it instead of sys.prefix or | ||
10 | sys.exec_prefix -- i.e., ignore 'plat_specific'. | ||
11 | """ | ||
12 | if prefix is None: | ||
13 | - prefix = plat_specific and EXEC_PREFIX or PREFIX | ||
14 | + if plat_specific: | ||
15 | + prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') | ||
16 | + else: | ||
17 | + prefix = plat_specific and EXEC_PREFIX or PREFIX | ||
18 | if os.name == "posix": | ||
19 | if python_build: | ||
20 | base = os.path.dirname(os.path.abspath(sys.executable)) | ||
21 | if plat_specific: | ||
22 | inc_dir = base | ||
23 | @@ -94,11 +97,14 @@ def get_python_lib(plat_specific=0, stan | ||
24 | |||
25 | If 'prefix' is supplied, use it instead of sys.prefix or | ||
26 | sys.exec_prefix -- i.e., ignore 'plat_specific'. | ||
27 | """ | ||
28 | if prefix is None: | ||
29 | - prefix = plat_specific and EXEC_PREFIX or PREFIX | ||
30 | + if plat_specific: | ||
31 | + prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') | ||
32 | + else: | ||
33 | + prefix = plat_specific and EXEC_PREFIX or PREFIX | ||
34 | |||
35 | if os.name == "posix": | ||
36 | libpython = os.path.join(prefix, | ||
37 | "lib", "python" + get_python_version()) | ||
38 | if standard_lib: | ||