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 | |
| parent | f377248abda877e2a945f4152e3e57bbaaeec1ca (diff) | |
| parent | 7260a427d88f1cbfcd8534c5f7805b4b56efb544 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/python2')
| -rw-r--r-- | package/python2/Makefile | 11 | ||||
| -rw-r--r-- | package/python2/files/python-config.patch (renamed from package/python2/files/patch-Misc_python-config_in) | 10 | ||||
| -rw-r--r-- | package/python2/patches/patch-Lib_distutils_sysconfig_py (renamed from package/python2/files/patch-Lib_distutils_sysconfig_py) | 0 |
3 files changed, 10 insertions, 11 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index a0fa499a8..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:= 8 +PKG_RELEASE:= 10 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -13,7 +13,7 @@ PKG_BUILDDEP:= autotool libffi python2-host PKG_DEPENDS:= libpthread libffi libgcc PKG_URL:= http://www.python.org/ PKG_SITES:= http://www.python.org/ftp/python/${PKG_VERSION}/ -PKG_OPTS:= dev noscripts +PKG_OPTS:= dev PKG_HOST_DEPENDS:= !netbsd !openbsd @@ -97,6 +97,7 @@ CONFIGURE_ARGS:= --with-threads \ HOST_STYLE:= auto HOST_CONFIGURE_ARGS:= --with-threads \ + --disable-ipv6 \ --disable-shared \ --disable-toolbox-glue \ --without-cxx-main @@ -105,12 +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 ) - (cd $(WRKBUILD) && patch -p1 < \ - $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py ) $(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) diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py index 30aae0816..30aae0816 100644 --- a/package/python2/files/patch-Lib_distutils_sysconfig_py +++ b/package/python2/patches/patch-Lib_distutils_sysconfig_py |