diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-12 15:34:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-12 15:34:29 +0100 |
| commit | ed6f93d17f4360b0125119d3becfd592d50689a6 (patch) | |
| tree | 4651ad91954cae730d10da3452a8c2c710bd2e6d /package/python2 | |
| parent | b5c9f6026929aec4a77002edb593d4ede6573bcf (diff) | |
| parent | 1820537b047086ac5d5c042296372a9ce2c5c822 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/python2')
| -rw-r--r-- | package/python2/Makefile | 6 | ||||
| -rw-r--r-- | package/python2/files/python-config.patch (renamed from package/python2/files/patch-Misc_python-config_in) | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index 452b48b16..933947523 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= python2 PKG_VERSION:= 2.7.5 -PKG_RELEASE:= 9 +PKG_RELEASE:= 10 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -106,10 +106,10 @@ CFLAGS_FOR_BUILD+= -fPIC hostpost-install: $(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \ $(STAGING_HOST_DIR)/usr/bin/pgen + (cd $(STAGING_HOST_DIR)/usr/bin && \ + patch -p0 < $(TOPDIR)/package/python2/files/python-config.patch) pre-configure: - (cd $(WRKBUILD) && patch -p1 < \ - $(TOPDIR)/package/python2/files/patch-Misc_python-config_in ) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in 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) |