summaryrefslogtreecommitdiff
path: root/package/python2
diff options
context:
space:
mode:
Diffstat (limited to 'package/python2')
-rw-r--r--package/python2/Makefile10
-rw-r--r--package/python2/patches/patch-Makefile_pre_in25
-rw-r--r--package/python2/patches/patch-configure_ac6
-rw-r--r--package/python2/patches/patch-setup_py24
4 files changed, 22 insertions, 43 deletions
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 32e8b33d9..ee99e3677 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -4,10 +4,10 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= python2
-PKG_VERSION:= 2.7.10
+PKG_VERSION:= 2.7.13
PKG_RELEASE:= 1
-PKG_HASH:= eda8ce6eec03e74991abb5384170e7c65fcd7522e409b8e83d7e6372add0f12a
-PKG_DESCR:= python scripting language (Version 2)
+PKG_HASH:= a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
+PKG_DESCR:= python2 script interpreter
PKG_SECTION:= dev/lang
PKG_DEPENDS:= libffi
PKG_BUILDDEP:= libffi python2-host
@@ -90,7 +90,6 @@ endif
HOST_CFLAGS+= -fPIC
AUTOTOOL_STYLE:= autoreconf
-MAKE_ENV+= HOSTPGEN=$(STAGING_HOST_DIR)/usr/bin/pgen
CONFIGURE_ENV+= ac_cv_have_long_long_format=yes \
ac_cv_file__dev_ptmx=yes \
ac_cv_file__dev_ptc=no
@@ -103,7 +102,6 @@ CONFIGURE_ARGS+= --with-threads \
HOST_CONFIGURE_ENV+= MACOSX_DEPLOYMENT_TARGET=10.9
HOST_CONFIGURE_ARGS+= --with-threads \
--with-system-ffi \
- --enable-shared \
--disable-ipv6 \
--disable-toolbox-glue \
--without-cxx-main
@@ -117,8 +115,6 @@ hostpre-configure:
$(WRKBUILD)/Misc/python-config.in
hostpost-install:
- $(INSTALL_BIN) ${WRKBUILD}/Parser/pgen \
- $(STAGING_HOST_DIR)/usr/bin/pgen
$(CP) $(ADK_TOPDIR)/package/python2/files/python-config.patch $(WRKBUILD)/
$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch
$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch
diff --git a/package/python2/patches/patch-Makefile_pre_in b/package/python2/patches/patch-Makefile_pre_in
index b68b57028..bcb0e1f6b 100644
--- a/package/python2/patches/patch-Makefile_pre_in
+++ b/package/python2/patches/patch-Makefile_pre_in
@@ -1,14 +1,6 @@
---- Python-2.7.9.orig/Makefile.pre.in 2014-12-10 16:59:50.000000000 +0100
-+++ Python-2.7.9/Makefile.pre.in 2015-04-11 14:06:58.373384200 +0200
-@@ -234,6 +234,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN= Parser/pgen$(EXE)
-+HOSTPGEN?= Parser/pgen$(EXE)
-
- PSRCS= \
- Parser/acceler.c \
-@@ -474,7 +475,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
+--- Python-2.7.13.orig/Makefile.pre.in 2016-12-17 21:05:06.000000000 +0100
++++ Python-2.7.13/Makefile.pre.in 2017-03-16 19:38:14.000000000 +0100
+@@ -545,7 +545,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.tx
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -17,16 +9,7 @@
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -611,7 +612,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/p
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
- @$(MKDIR_P) Include
- $(MAKE) $(PGEN)
-- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+ $(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- $(MAKE) $(GRAMMAR_H)
- touch $(GRAMMAR_C)
-@@ -1042,28 +1043,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
+@@ -1120,28 +1120,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
diff --git a/package/python2/patches/patch-configure_ac b/package/python2/patches/patch-configure_ac
index ae2c7ada1..1a09f6eed 100644
--- a/package/python2/patches/patch-configure_ac
+++ b/package/python2/patches/patch-configure_ac
@@ -1,5 +1,5 @@
---- Python-2.7.9.orig/configure.ac 2014-12-10 17:00:00.000000000 +0100
-+++ Python-2.7.9/configure.ac 2015-04-11 09:05:42.203804700 +0200
+--- Python-2.7.13.orig/configure.ac 2016-12-17 21:05:07.000000000 +0100
++++ Python-2.7.13/configure.ac 2017-03-16 19:29:41.000000000 +0100
@@ -22,7 +22,7 @@ rm -f pybuilddir.txt
if test "$cross_compiling" = yes; then
AC_MSG_CHECKING([for python interpreter for cross build])
@@ -9,7 +9,7 @@
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
-@@ -1070,9 +1070,7 @@ then
+@@ -1079,9 +1079,7 @@ then
if test "$Py_DEBUG" = 'true' ; then
# Optimization messes up debuggers, so turn it off for
# debug builds.
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index 065bf642b..bf8e90c9d 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,5 +1,5 @@
---- Python-2.7.9.orig/setup.py 2014-12-10 17:00:01.000000000 +0100
-+++ Python-2.7.9/setup.py 2015-04-11 08:37:49.609444500 +0200
+--- Python-2.7.13.orig/setup.py 2016-12-17 21:05:07.000000000 +0100
++++ Python-2.7.13/setup.py 2017-03-16 19:45:12.000000000 +0100
@@ -74,7 +74,7 @@ def find_file(filename, std_dirs, paths)
'paths' is a list of additional locations to check; if the file is
found in one of them, the resulting list will contain the directory.
@@ -42,10 +42,10 @@
- if host_platform == 'darwin' and is_macosx_sdk_path(p):
+ if host_platform == 'darwin' and is_macosx_sdk_path(p) and not cross_compiling:
- if os.path.join(sysroot, p[1:]) == dirname:
- return [ ]
-
-@@ -129,7 +129,7 @@ def find_library_file(compiler, libname,
+ # Note that, as of Xcode 7, Apple SDKs may contain textual stub
+ # libraries with .tbd extensions rather than the normal .dylib
+ # shared libraries installed in /. The Apple compiler tool
+@@ -145,7 +145,7 @@ def find_library_file(compiler, libname,
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)
@@ -54,7 +54,7 @@
if os.path.join(sysroot, p[1:]) == dirname:
return [ p ]
-@@ -162,6 +162,7 @@ class PyBuildExt(build_ext):
+@@ -178,6 +178,7 @@ class PyBuildExt(build_ext):
def build_extensions(self):
@@ -62,7 +62,7 @@
# Detect which modules should be compiled
missing = self.detect_modules()
-@@ -283,6 +284,7 @@ class PyBuildExt(build_ext):
+@@ -299,6 +300,7 @@ class PyBuildExt(build_ext):
def build_extension(self, ext):
@@ -70,7 +70,7 @@
if ext.name == '_ctypes':
if not self.configure_ctypes(ext):
return
-@@ -444,7 +446,8 @@ class PyBuildExt(build_ext):
+@@ -460,7 +462,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
if cross_compiling:
self.add_gcc_paths()
@@ -80,7 +80,7 @@
# Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files.
-@@ -481,7 +484,8 @@ class PyBuildExt(build_ext):
+@@ -497,7 +500,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.prefix) != '/usr' \
@@ -90,7 +90,7 @@
# OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
# (PYTHONFRAMEWORK is set) to avoid # linking problems when
# building a framework with different architectures than
-@@ -499,8 +503,13 @@ class PyBuildExt(build_ext):
+@@ -515,8 +519,13 @@ class PyBuildExt(build_ext):
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
@@ -104,7 +104,7 @@
if not cross_compiling:
for d in (
'/usr/include',
-@@ -534,7 +543,7 @@ class PyBuildExt(build_ext):
+@@ -550,7 +559,7 @@ class PyBuildExt(build_ext):
if host_platform == 'hp-ux11':
lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 15:48:29 +0000