From e45bc457ab9015c50a9f4e22ac248d780de826fe Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Dec 2013 20:37:10 +0100 Subject: fix release build for uClibc raspberry-pi --- package/python2/Makefile | 5 ++--- package/python2/files/patch-Lib_distutils_sysconfig_py | 10 ---------- package/python2/patches/patch-Lib_distutils_sysconfig_py | 10 ++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 package/python2/files/patch-Lib_distutils_sysconfig_py create mode 100644 package/python2/patches/patch-Lib_distutils_sysconfig_py (limited to 'package/python2') diff --git a/package/python2/Makefile b/package/python2/Makefile index a0fa499a8..f176a8337 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:= 9 PKG_MD5SUM:= b4f01a1d0ba0b46b05c73b2ac909b1df PKG_DESCR:= Python scripting language (Version 2) PKG_SECTION:= lang @@ -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 @@ -109,8 +110,6 @@ hostpost-install: 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-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/patches/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py new file mode 100644 index 000000000..30aae0816 --- /dev/null +++ b/package/python2/patches/patch-Lib_distutils_sysconfig_py @@ -0,0 +1,10 @@ +--- 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: -- cgit v1.2.3 From 1820537b047086ac5d5c042296372a9ce2c5c822 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Dec 2013 11:53:47 +0100 Subject: another try to fix python problems --- package/python2/Makefile | 6 +++--- package/python2/files/patch-Misc_python-config_in | 21 --------------------- package/python2/files/python-config.patch | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 package/python2/files/patch-Misc_python-config_in create mode 100644 package/python2/files/python-config.patch (limited to 'package/python2') diff --git a/package/python2/Makefile b/package/python2/Makefile index f176a8337..6d28fb10a 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/patch-Misc_python-config_in deleted file mode 100644 index 9734d4fbd..000000000 --- a/package/python2/files/patch-Misc_python-config_in +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 -@@ -3,6 +3,7 @@ - import sys - import os - import getopt -+import re - from distutils import sysconfig - - valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', -@@ -37,8 +38,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/files/python-config.patch b/package/python2/files/python-config.patch new file mode 100644 index 000000000..9478835d5 --- /dev/null +++ b/package/python2/files/python-config.patch @@ -0,0 +1,21 @@ +--- 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 + import getopt ++import re + from distutils import sysconfig + + valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', +@@ -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('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) -- cgit v1.2.3 From b5c9f6026929aec4a77002edb593d4ede6573bcf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 12 Dec 2013 15:34:09 +0100 Subject: noscripts is wrong now --- package/python2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/python2') diff --git a/package/python2/Makefile b/package/python2/Makefile index f176a8337..452b48b16 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -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 -- cgit v1.2.3