diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 09:01:56 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-31 09:01:56 +0100 |
| commit | e85afc45db93d7c66b63dd1e64189fad71d62080 (patch) | |
| tree | 012f58f7a6a9c78ae5a511a04adba32798ba53d5 /package/python2 | |
| parent | 7c2dd6bb405b72023f6043ff7b0cca9347e449d2 (diff) | |
| parent | f25b3442d6f58604117dfe73506e4d79f95c59d6 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/python2')
| -rw-r--r-- | package/python2/Makefile | 14 | ||||
| -rw-r--r-- | package/python2/patches/patch-Misc_python-config_in | 13 | ||||
| -rw-r--r-- | package/python2/patches/patch-configure_ac | 22 |
3 files changed, 37 insertions, 12 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile index c0678a528..82c89c433 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:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -95,21 +95,11 @@ CONFIGURE_ARGS:= --with-threads \ --with-system-ffi \ --without-cxx-main +HOST_STYLE:= auto HOST_CONFIGURE_ARGS:= --without-threads \ --disable-toolbox-glue \ --without-cxx-main -python2-hostinstall: - $(INSTALL_BIN) ${HOST_WRKINST}/usr/bin/python \ - $(STAGING_HOST_DIR)/usr/bin - $(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \ - $(STAGING_HOST_DIR)/usr/bin/pgen - $(CP) $(HOST_WRKINST)/usr/lib/python2.7 \ - $(STAGING_HOST_DIR)/usr/lib - $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/include/python2.7 - ${CP} ${HOST_WRKINST}/usr/include/python2.7/pyconfig.h \ - $(STAGING_HOST_DIR)/usr/include/python2.7 - python2-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/bin ${IDIR_PYTHON2}/usr/lib ${INSTALL_DIR} ${IDIR_PYTHON2}/usr/lib/python2.7 diff --git a/package/python2/patches/patch-Misc_python-config_in b/package/python2/patches/patch-Misc_python-config_in new file mode 100644 index 000000000..7ea806bea --- /dev/null +++ b/package/python2/patches/patch-Misc_python-config_in @@ -0,0 +1,13 @@ +--- 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:09:36.000000000 +0100 +@@ -37,8 +37,8 @@ for opt in opt_flags: + 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))] + if opt == '--cflags': + flags.extend(getvar('CFLAGS').split()) + print ' '.join(flags) diff --git a/package/python2/patches/patch-configure_ac b/package/python2/patches/patch-configure_ac new file mode 100644 index 000000000..0ec10f1de --- /dev/null +++ b/package/python2/patches/patch-configure_ac @@ -0,0 +1,22 @@ +--- Python-2.7.5.orig/configure.ac 2013-05-12 05:32:54.000000000 +0200 ++++ Python-2.7.5/configure.ac 2013-10-30 15:33:30.000000000 +0100 +@@ -19,7 +19,7 @@ AC_SUBST(host) + if test "$cross_compiling" = yes; then + AC_MSG_CHECKING([for python interpreter for cross build]) + if test -z "$PYTHON_FOR_BUILD"; then +- for interp in python$PACKAGE_VERSION python2 python; do ++ for interp in python; do + which $interp >/dev/null 2>&1 || continue + if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then + break +@@ -1066,9 +1066,7 @@ then + if test "$Py_DEBUG" = 'true' ; then + # Optimization messes up debuggers, so turn it off for + # debug builds. +- OPT="-g -O0 -Wall $STRICT_PROTO" +- else +- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" ++ OPT="$STRICT_PROTO" + fi + ;; + *) |