diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-15 14:12:00 +0100 |
| commit | 24db4fb9b27f4ea87b3ecdf8fd4dd07b62ba9514 (patch) | |
| tree | cec2d85b768a617ae371837eec7069e7f155e568 /package/python2/files | |
| parent | f377248abda877e2a945f4152e3e57bbaaeec1ca (diff) | |
| parent | 7260a427d88f1cbfcd8534c5f7805b4b56efb544 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/python2/files')
| -rw-r--r-- | package/python2/files/patch-Lib_distutils_sysconfig_py | 10 | ||||
| -rw-r--r-- | package/python2/files/python-config.patch (renamed from package/python2/files/patch-Misc_python-config_in) | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py deleted file mode 100644 index 30aae0816..000000000 --- a/package/python2/files/patch-Lib_distutils_sysconfig_py +++ /dev/null @@ -1,10 +0,0 @@ ---- Python-2.7.5.orig/Lib/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200 -+++ Python-2.7.5/Lib/distutils/sysconfig.py 2013-11-03 18:03:53.000000000 +0100 -@@ -76,6 +76,7 @@ def get_python_inc(plat_specific=0, pref - """ - if prefix is None: - prefix = plat_specific and EXEC_PREFIX or PREFIX -+ prefix = re.sub('host_', 'target_', prefix) - - if os.name == "posix": - if python_build: diff --git a/package/python2/files/patch-Misc_python-config_in b/package/python2/files/python-config.patch index 9734d4fbd..9478835d5 100644 --- a/package/python2/files/patch-Misc_python-config_in +++ b/package/python2/files/python-config.patch @@ -1,5 +1,5 @@ ---- Python-2.7.5.orig/Misc/python-config.in 2013-05-12 05:32:49.000000000 +0200 -+++ Python-2.7.5/Misc/python-config.in 2013-10-30 21:29:47.000000000 +0100 +--- python2.7-config.orig 2013-12-11 12:40:37.244519764 +0100 ++++ python2.7-config 2013-12-11 12:41:43.279093075 +0100 @@ -3,6 +3,7 @@ import sys import os @@ -8,14 +8,14 @@ from distutils import sysconfig valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', -@@ -37,8 +38,8 @@ for opt in opt_flags: +@@ -37,8 +38,8 @@ print sysconfig.EXEC_PREFIX elif opt in ('--includes', '--cflags'): - flags = ['-I' + sysconfig.get_python_inc(), - '-I' + sysconfig.get_python_inc(plat_specific=True)] -+ flags = ['-I' + re.sub('host_', 'target_', sysconfig.get_python_inc()), -+ '-I' + re.sub('host_', 'target_', sysconfig.get_python_inc(plat_specific=True))] ++ flags = ['-I' + re.sub('target_', 'host_', sysconfig.get_python_inc()), ++ '-I' + re.sub('target_', 'host_', sysconfig.get_python_inc(plat_specific=True))] if opt == '--cflags': flags.extend(getvar('CFLAGS').split()) print ' '.join(flags) |