summaryrefslogtreecommitdiff
path: root/package/python2/files
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:05:57 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-02 15:05:57 +0100
commitd93b039644847733687d1d30c09d6861fb57e8e4 (patch)
tree7693a1dd5aa5c974657ad1386c1cc630739e0b45 /package/python2/files
parentd88086dcd2cb3c1a742b87a9aaa58ec3ec39f30d (diff)
fix python breakage after STAGING_HOST_DIR renaming
Diffstat (limited to 'package/python2/files')
-rw-r--r--package/python2/files/patch-Lib_distutils_sysconfig_py10
-rw-r--r--package/python2/files/python-config.patch4
2 files changed, 12 insertions, 2 deletions
diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/files/patch-Lib_distutils_sysconfig_py
new file mode 100644
index 000000000..cbd51020d
--- /dev/null
+++ b/package/python2/files/patch-Lib_distutils_sysconfig_py
@@ -0,0 +1,10 @@
+--- Lib.orig/distutils/sysconfig.py 2013-05-12 05:32:42.000000000 +0200
++++ 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('@@STAGING_HOST_DIR@@', '@@STAGING_TARGET_DIR@@', prefix)
+
+ if os.name == "posix":
+ if python_build:
diff --git a/package/python2/files/python-config.patch b/package/python2/files/python-config.patch
index 9478835d5..0a6ff7145 100644
--- a/package/python2/files/python-config.patch
+++ b/package/python2/files/python-config.patch
@@ -14,8 +14,8 @@
elif opt in ('--includes', '--cflags'):
- flags = ['-I' + sysconfig.get_python_inc(),
- '-I' + 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))]
++ flags = ['-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc()),
++ '-I' + re.sub('@@STAGING_TARGET_DIR@@', '@@STAGING_HOST_DIR@@', sysconfig.get_python_inc(plat_specific=True))]
if opt == '--cflags':
flags.extend(getvar('CFLAGS').split())
print ' '.join(flags)