jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

python: bump to 2.7.2

Browse Source 
This is mostly a mechanical bump, with a refresh of all the patches to
accomodate the offsets, and some minor conflict resolution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2011-09-18 18:05:23 +02:00 committed by Peter Korsgaard
parent a21642c7eb
commit 2455c89bab
30 changed files with 279 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
package/python/python-2.7-001-support-for-build.patch
View File

@ -22,11 +22,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 17 +++++++++++++++++ configure.in | 17 +++++++++++++++++
2 files changed, 34 insertions(+), 15 deletions(-) 2 files changed, 34 insertions(+), 15 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -178,7 +178,8 @@ @@ -181,7 +181,8 @@
UNICODE_OBJS= @UNICODE_OBJS@ UNICODE_OBJS= @UNICODE_OBJS@
PYTHON= python$(EXE) PYTHON= python$(EXE)
@ -36,7 +36,7 @@ Index: Python-2.7.1/Makefile.pre.in
# The task to run while instrument when building the profile-opt target # The task to run while instrument when building the profile-opt target
PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck PROFILE_TASK= $(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
@@ -210,7 +211,8 @@ @@ -213,7 +214,8 @@
########################################################################## ##########################################################################
# Parser # Parser
@ -46,7 +46,7 @@ Index: Python-2.7.1/Makefile.pre.in
POBJS= \ POBJS= \
Parser/acceler.o \ Parser/acceler.o \
@@ -404,8 +406,8 @@ @@ -407,8 +409,8 @@
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \
@ -57,15 +57,16 @@ Index: Python-2.7.1/Makefile.pre.in
esac esac
# Build static library # Build static library
@@ -536,12 +538,12 @@ @@ -540,13 +542,13 @@
$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
# Use a stamp file to prevent make -j invoking pgen twice
-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) -Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
+Parser/pgen.stamp: $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)
-@$(INSTALL) -d Include -@$(INSTALL) -d Include
- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ -$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-touch Parser/pgen.stamp
-$(PGEN): $(PGENOBJS) -$(PGEN): $(PGENOBJS)
- $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@ -74,7 +75,7 @@ Index: Python-2.7.1/Makefile.pre.in
Parser/grammar.o: $(srcdir)/Parser/grammar.c \ Parser/grammar.o: $(srcdir)/Parser/grammar.c \
$(srcdir)/Include/token.h \ $(srcdir)/Include/token.h \
@@ -921,25 +923,25 @@ @@ -926,25 +928,25 @@
done done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
@ -105,7 +106,7 @@ Index: Python-2.7.1/Makefile.pre.in
# Create the PLATDIR source directory, if one wasn't distributed.. # Create the PLATDIR source directory, if one wasn't distributed..
$(srcdir)/Lib/$(PLATDIR): $(srcdir)/Lib/$(PLATDIR):
@@ -1044,7 +1046,7 @@ @@ -1049,7 +1051,7 @@
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: sharedmods
@ -114,20 +115,20 @@ Index: Python-2.7.1/Makefile.pre.in
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \ --install-platlib=$(DESTSHARED) \
@@ -1183,7 +1185,7 @@ @@ -1188,7 +1190,7 @@
find . -name '*.gc??' -exec rm -f {} ';' find . -name '*.gc??' -exec rm -f {} ';'
clobber: clean profile-removal clobber: clean profile-removal
- -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \ - -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
+ -rm -f $(BUILDPYTHON) $(BUILDPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \ + -rm -f $(BUILDPYTHON) $(BUILDPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
tags TAGS \ tags TAGS Parser/pgen.stamp \
config.cache config.log pyconfig.h Modules/config.c config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform -rm -rf build platform
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -4291,6 +4291,23 @@ @@ -4305,6 +4305,23 @@
done done
AC_MSG_RESULT(done) AC_MSG_RESULT(done)

18
package/python/python-2.7-002-cross-compile-variable.patch
View File

@ -15,11 +15,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 3 +++ configure.in | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-) 2 files changed, 6 insertions(+), 3 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -406,8 +406,8 @@ @@ -409,8 +409,8 @@
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \
@ -30,7 +30,7 @@ Index: Python-2.7.1/Makefile.pre.in
esac esac
# Build static library # Build static library
@@ -1046,7 +1046,7 @@ @@ -1051,7 +1051,7 @@
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: sharedmods
@ -39,11 +39,11 @@ Index: Python-2.7.1/Makefile.pre.in
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \ --install-platlib=$(DESTSHARED) \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -4308,6 +4308,9 @@ @@ -4322,6 +4322,9 @@
AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python]) AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])
AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen]) AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])

6
package/python/python-2.7-003-no-import-when-cross-compiling.patch
View File

@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 4 ++++ setup.py | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -304,6 +304,10 @@ @@ -304,6 +304,10 @@
self.announce('WARNING: skipping import check for Cygwin-based "%s"' self.announce('WARNING: skipping import check for Cygwin-based "%s"'
% ext.name) % ext.name)

22
package/python/python-2.7-004-no-host-headers-libs.patch
View File

@ -10,23 +10,25 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 39 +++++++++++++++++++++------------------ setup.py | 39 +++++++++++++++++++++------------------
1 file changed, 21 insertions(+), 18 deletions(-) 1 file changed, 21 insertions(+), 18 deletions(-)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -351,8 +351,9 @@ @@ -373,9 +373,10 @@
def detect_modules(self): def detect_modules(self):
# Ensure that /usr/local is always used # Ensure that /usr/local is always used
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
- self.add_multiarch_paths()
+ if os.environ.get('CROSS_COMPILING') != 'yes': + if os.environ.get('CROSS_COMPILING') != 'yes':
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ self.add_multiarch_paths()
# Add paths specified in the environment variables LDFLAGS and # Add paths specified in the environment variables LDFLAGS and
# CPPFLAGS for header and library files. # CPPFLAGS for header and library files.
@@ -360,10 +361,7 @@ @@ -383,10 +384,7 @@
# directly since an inconsistently reproducible issue comes up where # directly since an inconsistently reproducible issue comes up where
# the environment variable is not set even though the value were passed # the environment variable is not set even though the value were passed
# into configure and stored in the Makefile (issue found on OS X 10.3). # into configure and stored in the Makefile (issue found on OS X 10.3).
@ -38,7 +40,7 @@ Index: Python-2.7.1/setup.py
env_val = sysconfig.get_config_var(env_var) env_val = sysconfig.get_config_var(env_var)
if env_val: if env_val:
# To prevent optparse from raising an exception about any # To prevent optparse from raising an exception about any
@@ -388,17 +386,6 @@ @@ -411,17 +409,6 @@
for directory in reversed(options.dirs): for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory) add_dir_to_list(dir_list, directory)
@ -56,7 +58,7 @@ Index: Python-2.7.1/setup.py
try: try:
have_unicode = unicode have_unicode = unicode
except NameError: except NameError:
@@ -407,11 +394,16 @@ @@ -430,11 +417,16 @@
# lib_dirs and inc_dirs are used to search for files; # lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can # if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed. # be assumed that no additional -I,-L directives are needed.
@ -78,7 +80,7 @@ Index: Python-2.7.1/setup.py
exts = [] exts = []
missing = [] missing = []
@@ -844,6 +836,9 @@ @@ -867,6 +859,9 @@
db_inc_paths.append('/pkg/db-3.%d/include' % x) db_inc_paths.append('/pkg/db-3.%d/include' % x)
db_inc_paths.append('/opt/db-3.%d/include' % x) db_inc_paths.append('/opt/db-3.%d/include' % x)
@ -88,7 +90,7 @@ Index: Python-2.7.1/setup.py
# Add some common subdirectories for Sleepycat DB to the list, # Add some common subdirectories for Sleepycat DB to the list,
# based on the standard include directories. This way DB3/4 gets # based on the standard include directories. This way DB3/4 gets
# picked up when it is installed in a non-standard prefix and # picked up when it is installed in a non-standard prefix and
@@ -996,6 +991,9 @@ @@ -1019,6 +1014,9 @@
MIN_SQLITE_VERSION = ".".join([str(x) MIN_SQLITE_VERSION = ".".join([str(x)
for x in MIN_SQLITE_VERSION_NUMBER]) for x in MIN_SQLITE_VERSION_NUMBER])
@ -98,7 +100,7 @@ Index: Python-2.7.1/setup.py
# Scan the default include directories before the SQLite specific # Scan the default include directories before the SQLite specific
# ones. This allows one to override the copy of sqlite on OSX, # ones. This allows one to override the copy of sqlite on OSX,
# where /usr/include contains an old version of sqlite. # where /usr/include contains an old version of sqlite.
@@ -1095,6 +1093,8 @@ @@ -1118,6 +1116,8 @@
# the more recent berkeleydb's db.h file first in the include path # the more recent berkeleydb's db.h file first in the include path
# when attempting to compile and it will fail. # when attempting to compile and it will fail.
f = "/usr/include/db.h" f = "/usr/include/db.h"

10
package/python/python-2.7-005-staging-headers-libs.patch
View File

@ -12,12 +12,12 @@ Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>
setup.py | 13 +++++++++++++ setup.py | 13 +++++++++++++
1 file changed, 13 insertions(+) 1 file changed, 13 insertions(+)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -350,6 +350,19 @@ @@ -372,6 +372,19 @@
return sys.platform os.unlink(tmpfile)
def detect_modules(self): def detect_modules(self):
+ try: + try:

26
package/python/python-2.7-006-disable-extensions.patch
View File

@ -38,11 +38,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 5 ++++- setup.py | 5 ++++-
3 files changed, 11 insertions(+), 4 deletions(-) 3 files changed, 11 insertions(+), 4 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -141,6 +141,8 @@ @@ -144,6 +144,8 @@
# configure script arguments # configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@ CONFIG_ARGS= @CONFIG_ARGS@
@ -51,7 +51,7 @@ Index: Python-2.7.1/Makefile.pre.in
# Subdirectories with code # Subdirectories with code
SRCDIRS= @SRCDIRS@ SRCDIRS= @SRCDIRS@
@@ -406,8 +408,8 @@ @@ -409,8 +411,8 @@
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \
@ -62,7 +62,7 @@ Index: Python-2.7.1/Makefile.pre.in
esac esac
# Build static library # Build static library
@@ -1046,7 +1048,7 @@ @@ -1051,7 +1053,7 @@
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: sharedmods
@ -71,11 +71,11 @@ Index: Python-2.7.1/Makefile.pre.in
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \ --install-platlib=$(DESTSHARED) \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2084,6 +2084,8 @@ @@ -2098,6 +2098,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
@ -84,10 +84,10 @@ Index: Python-2.7.1/configure.in
# Check for use of the system expat library # Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat) AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat, AC_ARG_WITH(system_expat,
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -21,7 +21,10 @@ @@ -21,7 +21,10 @@
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')

8
package/python/python-2.7-007-do-not-generate-pyo-files.patch
View File

@ -13,11 +13,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Makefile.pre.in | 9 --------- Makefile.pre.in | 9 ---------
1 file changed, 9 deletions(-) 1 file changed, 9 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -929,20 +929,11 @@ @@ -934,20 +934,11 @@
-d $(LIBDEST) -f \ -d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
$(DESTDIR)$(LIBDEST) $(DESTDIR)$(LIBDEST)

16
package/python/python-2.7-008-reread-environment.patch
View File

@ -25,11 +25,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 3 +++ setup.py | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-) 2 files changed, 6 insertions(+), 3 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -408,8 +408,8 @@ @@ -411,8 +411,8 @@
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \
@ -40,7 +40,7 @@ Index: Python-2.7.1/Makefile.pre.in
esac esac
# Build static library # Build static library
@@ -1039,7 +1039,7 @@ @@ -1044,7 +1044,7 @@
# Install the dynamically loadable modules # Install the dynamically loadable modules
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
sharedinstall: sharedmods sharedinstall: sharedmods
@ -49,10 +49,10 @@ Index: Python-2.7.1/Makefile.pre.in
--prefix=$(prefix) \ --prefix=$(prefix) \
--install-scripts=$(BINDIR) \ --install-scripts=$(BINDIR) \
--install-platlib=$(DESTSHARED) \ --install-platlib=$(DESTSHARED) \
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -20,6 +20,9 @@ @@ -20,6 +20,9 @@
# Were we compiled --with-pydebug or with #define Py_DEBUG? # Were we compiled --with-pydebug or with #define Py_DEBUG?
COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount') COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')

8
package/python/python-2.7-009-python-symlink.patch
View File

@ -10,11 +10,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Makefile.pre.in | 2 +- Makefile.pre.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -791,7 +791,7 @@ @@ -796,7 +796,7 @@
then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
else true; \ else true; \
fi fi

24
package/python/python-2.7-010-change-pyconfig-h-location.patch
View File

@ -26,10 +26,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Makefile.pre.in | 3 ++- Makefile.pre.in | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-) 3 files changed, 5 insertions(+), 3 deletions(-)
Index: Python-2.7.1/Lib/distutils/sysconfig.py Index: Python-2.7.2/Lib/distutils/sysconfig.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/Lib/distutils/sysconfig.py --- Python-2.7.2.orig/Lib/distutils/sysconfig.py
+++ Python-2.7.1/Lib/distutils/sysconfig.py +++ Python-2.7.2/Lib/distutils/sysconfig.py
@@ -193,7 +193,8 @@ @@ -193,7 +193,8 @@
else: else:
inc_dir = project_base inc_dir = project_base
@ -40,11 +40,11 @@ Index: Python-2.7.1/Lib/distutils/sysconfig.py
if get_python_version() < '2.2': if get_python_version() < '2.2':
config_h = 'config.h' config_h = 'config.h'
else: else:
Index: Python-2.7.1/Lib/sysconfig.py Index: Python-2.7.2/Lib/sysconfig.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/Lib/sysconfig.py --- Python-2.7.2.orig/Lib/sysconfig.py
+++ Python-2.7.1/Lib/sysconfig.py +++ Python-2.7.2/Lib/sysconfig.py
@@ -371,7 +371,7 @@ @@ -356,7 +356,7 @@
else: else:
inc_dir = _PROJECT_BASE inc_dir = _PROJECT_BASE
else: else:
@ -53,11 +53,11 @@ Index: Python-2.7.1/Lib/sysconfig.py
return os.path.join(inc_dir, 'pyconfig.h') return os.path.join(inc_dir, 'pyconfig.h')
def get_scheme_names(): def get_scheme_names():
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -967,7 +967,6 @@ @@ -972,7 +972,6 @@
echo $(INSTALL_DATA) $$i $(INCLUDEPY); \ echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \ $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \
done done
@ -65,7 +65,7 @@ Index: Python-2.7.1/Makefile.pre.in
# Install the library and miscellaneous stuff needed for extending/embedding # Install the library and miscellaneous stuff needed for extending/embedding
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
@@ -1001,6 +1000,8 @@ @@ -1006,6 +1005,8 @@
$(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile

14
package/python/python-2.7-011-no-rpath.patch
View File

@ -13,11 +13,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 21 ++++++++++++++++++--- setup.py | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-) 1 file changed, 18 insertions(+), 3 deletions(-)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -977,6 +977,12 @@ @@ -997,6 +997,12 @@
print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
db_incs = [db_incdir] db_incs = [db_incdir]
dblibs = [dblib] dblibs = [dblib]
@ -30,7 +30,7 @@ Index: Python-2.7.1/setup.py
# We add the runtime_library_dirs argument because the # We add the runtime_library_dirs argument because the
# BerkeleyDB lib we're linking against often isn't in the # BerkeleyDB lib we're linking against often isn't in the
# system dynamic library search path. This is usually # system dynamic library search path. This is usually
@@ -986,7 +992,7 @@ @@ -1006,7 +1012,7 @@
exts.append(Extension('_bsddb', ['_bsddb.c'], exts.append(Extension('_bsddb', ['_bsddb.c'],
depends = ['bsddb.h'], depends = ['bsddb.h'],
library_dirs=dblib_dir, library_dirs=dblib_dir,
@ -39,7 +39,7 @@ Index: Python-2.7.1/setup.py
include_dirs=db_incs, include_dirs=db_incs,
libraries=dblibs)) libraries=dblibs))
else: else:
@@ -1092,12 +1098,17 @@ @@ -1112,12 +1118,17 @@
else: else:
sqlite_extra_link_args = () sqlite_extra_link_args = ()
@ -58,7 +58,7 @@ Index: Python-2.7.1/setup.py
extra_link_args=sqlite_extra_link_args, extra_link_args=sqlite_extra_link_args,
libraries=["sqlite3",])) libraries=["sqlite3",]))
else: else:
@@ -1198,9 +1209,13 @@ @@ -1218,9 +1229,13 @@
elif cand == "bdb": elif cand == "bdb":
if db_incs is not None: if db_incs is not None:
print "building dbm using bdb" print "building dbm using bdb"

10
package/python/python-2.7-012-correct-32bit-64bit-check.patch
View File

@ -16,10 +16,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 12 ++++++++++-- setup.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-) 1 file changed, 10 insertions(+), 2 deletions(-)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -29,6 +29,14 @@ @@ -29,6 +29,14 @@
except KeyError: except KeyError:
disabled_module_list = list() disabled_module_list = list()
@ -35,7 +35,7 @@ Index: Python-2.7.1/setup.py
def add_dir_to_list(dirlist, dir): def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if """Add the directory 'dir' to the list 'dirlist' (at the front) if
1) 'dir' is not already in 'dirlist' 1) 'dir' is not already in 'dirlist'
@@ -608,7 +616,7 @@ @@ -628,7 +636,7 @@
exts.append( Extension('audioop', ['audioop.c']) ) exts.append( Extension('audioop', ['audioop.c']) )
# Disabled on 64-bit platforms # Disabled on 64-bit platforms
@ -44,7 +44,7 @@ Index: Python-2.7.1/setup.py
# Operations on images # Operations on images
exts.append( Extension('imageop', ['imageop.c']) ) exts.append( Extension('imageop', ['imageop.c']) )
else: else:
@@ -1424,7 +1432,7 @@ @@ -1444,7 +1452,7 @@
missing.append('_codecs_%s' % loc) missing.append('_codecs_%s' % loc)
# Dynamic loading module # Dynamic loading module

22
package/python/python-2.7-013-fix-linux-3-compilation.patch
View File

@ -1,20 +1,22 @@
diff -r 683202530137 configure Index: Python-2.7.2/configure
--- a/configure Fri Aug 12 11:40:39 2011 +0300 ===================================================================
+++ b/configure Fri Aug 12 14:02:18 2011 +0200 --- Python-2.7.2.orig/configure
@@ -3055,6 +3055,7 @@ then +++ Python-2.7.2/configure
cygwin*) MACHDEP="cygwin";; @@ -3007,6 +3007,7 @@
darwin*) MACHDEP="darwin";; darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";; irix646) MACHDEP="irix6";;
+ linux*) MACHDEP="linux2";; + linux*) MACHDEP="linux2";;
'') MACHDEP="unknown";; '') MACHDEP="unknown";;
esac esac
fi fi
diff -r 683202530137 configure.in Index: Python-2.7.2/configure.in
--- a/configure.in Fri Aug 12 11:40:39 2011 +0300 ===================================================================
+++ b/configure.in Fri Aug 12 14:02:18 2011 +0200 --- Python-2.7.2.orig/configure.in
@@ -307,6 +307,7 @@ then +++ Python-2.7.2/configure.in
cygwin*) MACHDEP="cygwin";; @@ -297,6 +297,7 @@
darwin*) MACHDEP="darwin";; darwin*) MACHDEP="darwin";;
atheos*) MACHDEP="atheos";;
irix646) MACHDEP="irix6";; irix646) MACHDEP="irix6";;
+ linux*) MACHDEP="linux2";; + linux*) MACHDEP="linux2";;
'') MACHDEP="unknown";; '') MACHDEP="unknown";;

8
package/python/python-2.7-014-verbose-module-build.patch
View File

@ -4,11 +4,11 @@ Patch borrowed from OpenBricks.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -408,7 +408,7 @@ @@ -411,7 +411,7 @@
# Build the shared modules # Build the shared modules
sharedmods: $(BUILDPYTHON) sharedmods: $(BUILDPYTHON)
@case $$MAKEFLAGS in \ @case $$MAKEFLAGS in \

14
package/python/python-2.7-015-distutils-cross-compilation-support.patch
View File

@ -8,10 +8,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Lib/distutils/sysconfig.py | 7 ++++--- Lib/distutils/sysconfig.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-) 1 files changed, 4 insertions(+), 3 deletions(-)
Index: Python-2.7.1/Lib/distutils/sysconfig.py Index: Python-2.7.2/Lib/distutils/sysconfig.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/Lib/distutils/sysconfig.py --- Python-2.7.2.orig/Lib/distutils/sysconfig.py
+++ Python-2.7.1/Lib/distutils/sysconfig.py +++ Python-2.7.2/Lib/distutils/sysconfig.py
@@ -19,13 +19,22 @@ @@ -19,13 +19,22 @@
from distutils.errors import DistutilsPlatformError from distutils.errors import DistutilsPlatformError
@ -56,11 +56,11 @@ Index: Python-2.7.1/Lib/distutils/sysconfig.py
lib_dir = get_python_lib(plat_specific=1, standard_lib=1) lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
return os.path.join(lib_dir, "config", "Makefile") return os.path.join(lib_dir, "config", "Makefile")
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -4424,6 +4424,21 @@ @@ -4328,6 +4328,21 @@
CROSS_COMPILING=$cross_compiling CROSS_COMPILING=$cross_compiling
AC_SUBST(CROSS_COMPILING) AC_SUBST(CROSS_COMPILING)

37
package/python/python-2.7-100-optional-test-modules.patch
View File

@ -10,20 +10,19 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
2 files changed, 33 insertions(+), 13 deletions(-) 2 files changed, 33 insertions(+), 13 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -851,23 +851,37 @@ @@ -856,23 +856,30 @@
plat-mac/lib-scriptpackages/SystemEvents \ plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
-LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \ -LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
- lib-tk/test/test_ttk site-packages test test/data \ - lib-tk/test/test_ttk site-packages test test/data \
- test/decimaltestdata test/xmltestdata \ - test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
- test/tracedmodules \ - test/tracedmodules \
+LIBSUBDIRS= lib-tk \ +LIBSUBDIRS= lib-tk site-packages \
+ site-packages \
encodings compiler hotshot \ encodings compiler hotshot \
- email email/mime email/test email/test/data \ - email email/mime email/test email/test/data \
- json json/tests \ - json json/tests \
@ -49,27 +48,21 @@ Index: Python-2.7.1/Makefile.pre.in
+ifeq (@TEST_MODULES@,yes) +ifeq (@TEST_MODULES@,yes)
+LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ +LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
+ lib-tk/test/test_ttk test test/data \ + lib-tk/test/test_ttk test test/data \
+ test/decimaltestdata test/xmltestdata \ + test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ test/tracedmodules \ + test/tracedmodules email/test email/test/data \
+ email/test email/test/data \ + json/tests sqlite3/test bsddb/test lib2to3/tests \
+ sqlite3/test \ + lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+ bsddb/test \ + ctypes/test distutils/tests unittest/test
+ lib2to3/tests \
+ lib2to3/tests/data \
+ lib2to3/tests/data/fixers \
+ lib2to3/tests/data/fixers/myfixes \
+ ctypes/test distutils/tests \
+ unittest/test
+endif +endif
+ +
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2393,6 +2393,12 @@ @@ -2408,6 +2408,12 @@
fi fi

30
package/python/python-2.7-101-optional-pydoc.patch
View File

@ -11,11 +11,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 10 +++++++--- setup.py | 10 +++++++---
3 files changed, 17 insertions(+), 4 deletions(-) 3 files changed, 17 insertions(+), 4 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -864,7 +864,7 @@ @@ -868,7 +868,7 @@
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest \ unittest \
lib-old \ lib-old \
@ -24,8 +24,8 @@ Index: Python-2.7.1/Makefile.pre.in
ifeq (@TEST_MODULES@,yes) ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
@@ -882,6 +882,10 @@ @@ -880,6 +880,10 @@
unittest/test ctypes/test distutils/tests unittest/test
endif endif
+ifeq (@PYDOC@,yes) +ifeq (@PYDOC@,yes)
@ -35,11 +35,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2392,6 +2392,11 @@ @@ -2407,6 +2407,11 @@
esac]) esac])
fi fi
@ -51,11 +51,11 @@ Index: Python-2.7.1/configure.in
AC_SUBST(TEST_MODULES) AC_SUBST(TEST_MODULES)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -2072,6 +2072,12 @@ @@ -2092,6 +2092,12 @@
# turn off warnings when deprecated modules are imported # turn off warnings when deprecated modules are imported
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)
@ -68,7 +68,7 @@ Index: Python-2.7.1/setup.py
setup(# PyPI Metadata (PEP 301) setup(# PyPI Metadata (PEP 301)
name = "Python", name = "Python",
version = sys.version.split()[0], version = sys.version.split()[0],
@@ -2092,9 +2098,7 @@ @@ -2112,9 +2118,7 @@
ext_modules=[Extension('_struct', ['_struct.c'])], ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install # Scripts to install

51
package/python/python-2.7-102-optional-2to3.patch
View File

@ -11,34 +11,29 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 5 +++-- setup.py | 5 +++--
3 files changed, 26 insertions(+), 9 deletions(-) 3 files changed, 26 insertions(+), 9 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -856,9 +856,7 @@ @@ -862,7 +862,6 @@
encodings compiler hotshot \
email email/mime \
json \ json \
- sqlite3 \ sqlite3 \
logging bsddb csv importlib wsgiref \ logging bsddb csv importlib wsgiref \
- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \
ctypes ctypes/macholib idlelib idlelib/Icons \ ctypes ctypes/macholib idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \ distutils distutils/command $(XMLLIBSUBDIRS) \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
@@ -872,12 +870,7 @@ @@ -875,8 +874,7 @@
test/decimaltestdata test/xmltestdata \ lib-tk/test/test_ttk test test/data \
test/tracedmodules \ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
email/test email/test/data \ test/tracedmodules email/test email/test/data \
- sqlite3/test \ - json/tests sqlite3/test bsddb/test lib2to3/tests \
bsddb/test \ - lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
- lib2to3/tests \ + json/tests sqlite3/test bsddb/test \
- lib2to3/tests/data \ ctypes/test distutils/tests unittest/test
- lib2to3/tests/data/fixers \
- lib2to3/tests/data/fixers/myfixes \
ctypes/test distutils/tests \
unittest/test
endif endif
@@ -886,6 +879,23 @@
@@ -884,6 +882,23 @@
LIBSUBDIRS += pydoc_data LIBSUBDIRS += pydoc_data
endif endif
@ -62,11 +57,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2404,6 +2404,12 @@ @@ -2419,6 +2419,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]), AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@ -79,11 +74,11 @@ Index: Python-2.7.1/configure.in
# Check for enable-ipv6 # Check for enable-ipv6
AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
AC_MSG_CHECKING([if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified])
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -2073,10 +2073,11 @@ @@ -2093,10 +2093,11 @@
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)

8
package/python/python-2.7-103-optional-sqlite.patch
View File

@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 9 +++++++++ configure.in | 9 +++++++++
1 file changed, 9 insertions(+) 1 file changed, 9 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2392,6 +2392,15 @@ @@ -2407,6 +2407,15 @@
esac]) esac])
fi fi

29
package/python/python-2.7-104-optional-tk.patch
View File

@ -7,31 +7,30 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 9 +++++++++ configure.in | 9 +++++++++
2 files changed, 19 insertions(+), 4 deletions(-) 2 files changed, 19 insertions(+), 4 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -851,8 +851,7 @@ @@ -856,7 +856,7 @@
plat-mac/lib-scriptpackages/SystemEvents \ plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
-LIBSUBDIRS= lib-tk \ -LIBSUBDIRS= lib-tk site-packages \
- site-packages \
+LIBSUBDIRS= site-packages \ +LIBSUBDIRS= site-packages \
encodings compiler hotshot \ encodings compiler hotshot \
email email/mime \ email email/mime \
json \ json \
@@ -865,8 +864,7 @@ @@ -870,8 +870,7 @@
curses $(MACHDEPS) curses $(MACHDEPS)
ifeq (@TEST_MODULES@,yes) ifeq (@TEST_MODULES@,yes)
-LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ -LIBSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \
- lib-tk/test/test_ttk test test/data \ - lib-tk/test/test_ttk test test/data \
+LIBSUBDIRS += test test/data \ +LIBSUBDIRS += test test/data \
test/decimaltestdata test/xmltestdata \ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
test/tracedmodules \ test/tracedmodules email/test email/test/data \
email/test email/test/data \ json/tests sqlite3/test bsddb/test \
@@ -896,6 +894,14 @@ @@ -899,6 +898,14 @@
endif endif
endif endif
@ -46,11 +45,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2401,6 +2401,15 @@ @@ -2416,6 +2416,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi fi

18
package/python/python-2.7-105-optional-curses.patch
View File

@ -7,11 +7,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 9 +++++++++ configure.in | 9 +++++++++
2 files changed, 14 insertions(+), 1 deletion(-) 2 files changed, 14 insertions(+), 1 deletion(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -861,7 +861,7 @@ @@ -867,7 +867,7 @@
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest \ unittest \
lib-old \ lib-old \
@ -20,7 +20,7 @@ Index: Python-2.7.1/Makefile.pre.in
ifeq (@TEST_MODULES@,yes) ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += test test/data \ LIBSUBDIRS += test test/data \
@@ -902,6 +902,10 @@ @@ -906,6 +906,10 @@
endif endif
endif endif
@ -31,11 +31,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2410,6 +2410,15 @@ @@ -2425,6 +2425,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi fi

28
package/python/python-2.7-106-optional-expat.patch
View File

@ -14,12 +14,12 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
setup.py | 2 +- setup.py | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-) 3 files changed, 19 insertions(+), 7 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -857,7 +857,7 @@ @@ -863,7 +863,7 @@
json \ sqlite3 \
logging bsddb csv importlib wsgiref \ logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib idlelib idlelib/Icons \ ctypes ctypes/macholib idlelib idlelib/Icons \
- distutils distutils/command $(XMLLIBSUBDIRS) \ - distutils distutils/command $(XMLLIBSUBDIRS) \
@ -27,7 +27,7 @@ Index: Python-2.7.1/Makefile.pre.in
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
unittest \ unittest \
lib-old \ lib-old \
@@ -906,6 +906,10 @@ @@ -910,6 +910,10 @@
LIBSUBDIRS += curses LIBSUBDIRS += curses
endif endif
@ -38,11 +38,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2087,13 +2087,21 @@ @@ -2102,13 +2102,21 @@
AC_SUBST(DISABLED_EXTENSIONS) AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library # Check for use of the system expat library
@ -69,11 +69,11 @@ Index: Python-2.7.1/configure.in
# Check for use of the system libffi library # Check for use of the system libffi library
AC_MSG_CHECKING(for --with-system-ffi) AC_MSG_CHECKING(for --with-system-ffi)
Index: Python-2.7.1/setup.py Index: Python-2.7.2/setup.py
=================================================================== ===================================================================
--- Python-2.7.1.orig/setup.py --- Python-2.7.2.orig/setup.py
+++ Python-2.7.1/setup.py +++ Python-2.7.2/setup.py
@@ -1383,7 +1383,7 @@ @@ -1403,7 +1403,7 @@
# #
# More information on Expat can be found at www.libexpat.org. # More information on Expat can be found at www.libexpat.org.
# #

8
package/python/python-2.7-107-optional-codecs-cjk.patch
View File

@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2409,6 +2409,12 @@ @@ -2424,6 +2424,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi fi

8
package/python/python-2.7-108-optional-nis.patch
View File

@ -9,11 +9,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2415,6 +2415,12 @@ @@ -2430,6 +2430,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi]) fi])

8
package/python/python-2.7-109-optional-unicodedata.patch
View File

@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2421,6 +2421,12 @@ @@ -2436,6 +2436,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi]) fi])

35
package/python/python-2.7-110-optional-db.patch
View File

@ -11,28 +11,29 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 22 ++++++++++++++++++++++ configure.in | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-) 2 files changed, 30 insertions(+), 2 deletions(-)
Index: Python-2.7.1/Makefile.pre.in Index: Python-2.7.2/Makefile.pre.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/Makefile.pre.in --- Python-2.7.2.orig/Makefile.pre.in
+++ Python-2.7.1/Makefile.pre.in +++ Python-2.7.2/Makefile.pre.in
@@ -855,7 +855,7 @@ @@ -861,7 +861,7 @@
encodings compiler hotshot \
email email/mime \ email email/mime \
json \ json \
sqlite3 \
- logging bsddb csv importlib wsgiref \ - logging bsddb csv importlib wsgiref \
+ logging csv importlib wsgiref \ + logging csv importlib wsgiref \
ctypes ctypes/macholib idlelib idlelib/Icons \ ctypes ctypes/macholib idlelib idlelib/Icons \
distutils distutils/command \ distutils distutils/command \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
@@ -868,7 +868,6 @@ @@ -873,7 +873,7 @@
test/decimaltestdata test/xmltestdata \ LIBSUBDIRS += test test/data \
test/tracedmodules \ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
email/test email/test/data \ test/tracedmodules email/test email/test/data \
- bsddb/test \ - json/tests sqlite3/test bsddb/test \
ctypes/test distutils/tests \ + json/tests sqlite3/test \
unittest/test ctypes/test distutils/tests unittest/test
endif endif
@@ -910,6 +909,13 @@
@@ -914,6 +914,13 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS) LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif endif
@ -46,11 +47,11 @@ Index: Python-2.7.1/Makefile.pre.in
libinstall: build_all $(srcdir)/Lib/$(PLATDIR) libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
@for i in $(SCRIPTDIR) $(LIBDEST); \ @for i in $(SCRIPTDIR) $(LIBDEST); \
do \ do \
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2421,6 +2421,28 @@ @@ -2436,6 +2436,28 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi]) fi])

8
package/python/python-2.7-111-optional-ssl.patch
View File

@ -6,11 +6,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2421,6 +2421,12 @@ @@ -2436,6 +2436,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi]) fi])

8
package/python/python-2.7-112-optional-bzip2.patch
View File

@ -5,11 +5,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2427,6 +2427,12 @@ @@ -2442,6 +2442,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi]) fi])

8
package/python/python-2.7-113-optional-zlib.patch
View File

@ -5,11 +5,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
configure.in | 6 ++++++ configure.in | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
Index: Python-2.7.1/configure.in Index: Python-2.7.2/configure.in
=================================================================== ===================================================================
--- Python-2.7.1.orig/configure.in --- Python-2.7.2.orig/configure.in
+++ Python-2.7.1/configure.in +++ Python-2.7.2/configure.in
@@ -2433,6 +2433,12 @@ @@ -2448,6 +2448,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi]) fi])

2
package/python/python.mk
View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
PYTHON_VERSION_MAJOR = 2.7 PYTHON_VERSION_MAJOR = 2.7
PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).1 PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).2
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.bz2 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.bz2
PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION) PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)