* [Buildroot] [PATCH 0/4] Python and Python 3 version bumps
@ 2014-12-28 20:54 Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 1/4] python3: bump to 3.4.2 Thomas Petazzoni
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
Hello,
This set of four patches bump Python and Python 3 to the latest
available versions, and also rename the Python and Python 3 patches to
follow the new patch naming convention.
Thanks,
Thomas
Thomas Petazzoni (4):
python3: bump to 3.4.2
python3: rename patches to the new convention
python: bump to 2.7.9
python: rename patches to the new convention
...ath.patch => 001-remove-host-header-path.patch} | 2 +-
...thon-inc.patch => 002-fix-get-python-inc.patch} | 0
...ch => 004-sysconfigdata-install-location.patch} | 22 ++++++++++-----------
...itional.patch => 005-pyc-pyo-conditional.patch} | 4 ++--
...o.patch => 006-cross-compile-getaddrinfo.patch} | 2 +-
...tensions.patch => 007-disable-extensions.patch} | 8 ++++----
...atch => 008-distutils-use-python-sysroot.patch} | 0
...t-path.patch => 009-no-termcap-host-path.patch} | 2 +-
...on-config.patch => 010-fix-python-config.patch} | 20 +++++++++----------
...mlink.patch => 011-remove-python-symlink.patch} | 2 +-
...> 012-support-library-path-old-compilers.patch} | 6 +++---
...ath.patch => 013-dont-add-multiarch-path.patch} | 2 +-
...les.patch => 014-abort-on-failed-modules.patch} | 2 +-
....patch => 015-fix-sqlite-without-threads.patch} | 7 ++++---
...und.patch => 016-serial-ioctl-workaround.patch} | 7 ++++---
...17-distutils-scripts-dont-adjust-shebang.patch} | 0
...dules.patch => 100-optional-test-modules.patch} | 17 ++++++++--------
...tional-pydoc.patch => 101-optional-pydoc.patch} | 12 +++++------
...optional-2to3.patch => 102-optional-2to3.patch} | 14 ++++++-------
...onal-sqlite.patch => 103-optional-sqlite.patch} | 12 +++++------
...104-optional-tk.patch => 104-optional-tk.patch} | 14 ++++++-------
...onal-curses.patch => 105-optional-curses.patch} | 8 ++++----
...tional-expat.patch => 106-optional-expat.patch} | 8 ++++----
...ecs-cjk.patch => 107-optional-codecs-cjk.patch} | 2 +-
...8-optional-nis.patch => 108-optional-nis.patch} | 2 +-
...dedata.patch => 109-optional-unicodedata.patch} | 2 +-
...110-optional-db.patch => 110-optional-db.patch} | 10 +++++-----
...1-optional-ssl.patch => 111-optional-ssl.patch} | 2 +-
...tional-bzip2.patch => 112-optional-bzip2.patch} | 2 +-
...optional-zlib.patch => 113-optional-zlib.patch} | 2 +-
...e-editor.patch => 114-remove-idle-editor.patch} | 6 +++---
...ython-003-properly-detect-if-python-build.patch | 23 ----------------------
package/python/python.mk | 3 ++-
...ath.patch => 001-remove-host-header-path.patch} | 2 +-
...h => 002-properly-detect-if-python-build.patch} | 2 +-
...ch => 003-sysconfigdata-install-location.patch} | 16 +++++++--------
...dlib-cache.patch => 004-old-stdlib-cache.patch} | 6 +++---
...itional.patch => 005-pyc-pyo-conditional.patch} | 4 ++--
...o.patch => 006-cross-compile-getaddrinfo.patch} | 2 +-
...tensions.patch => 007-disable-extensions.patch} | 10 +++++-----
...08-distutils-sysconfig-use-sysconfigdata.patch} | 19 +++++-------------
...atch => 009-distutils-use-python-sysroot.patch} | 2 +-
...t-path.patch => 010-no-termcap-host-path.patch} | 2 +-
...> 011-support-library-path-old-compilers.patch} | 6 +++---
...ath.patch => 012-dont-add-multiarch-path.patch} | 2 +-
...les.patch => 013-abort-on-failed-modules.patch} | 2 +-
...und.patch => 014-serial-ioctl-workaround.patch} | 0
...15-distutils-scripts-dont-adjust-shebang.patch} | 0
...ep3147.patch => 016-distutils-no-pep3147.patch} | 0
...atch => 017-python-config-include-libdir.patch} | 0
...dules.patch => 100-optional-test-modules.patch} | 6 +++---
...tional-pydoc.patch => 101-optional-pydoc.patch} | 12 +++++------
...optional-2to3.patch => 102-optional-2to3.patch} | 14 ++++++-------
...onal-sqlite.patch => 103-optional-sqlite.patch} | 8 ++++----
...104-optional-tk.patch => 104-optional-tk.patch} | 8 ++++----
...onal-curses.patch => 105-optional-curses.patch} | 6 +++---
...tional-expat.patch => 106-optional-expat.patch} | 8 ++++----
...ecs-cjk.patch => 107-optional-codecs-cjk.patch} | 2 +-
...8-optional-nis.patch => 108-optional-nis.patch} | 2 +-
...dedata.patch => 109-optional-unicodedata.patch} | 2 +-
...optional-idle.patch => 110-optional-idle.patch} | 10 +++++-----
...al-decimal.patch => 111-optional-decimal.patch} | 4 ++--
package/python3/python3.mk | 9 ++++++++-
63 files changed, 185 insertions(+), 206 deletions(-)
rename package/python/{python-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (98%)
rename package/python/{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} (100%)
rename package/python/{python-004-sysconfigdata-install-location.patch => 004-sysconfigdata-install-location.patch} (87%)
rename package/python/{python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (97%)
rename package/python/{python-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (94%)
rename package/python/{python-007-disable-extensions.patch => 007-disable-extensions.patch} (95%)
rename package/python/{python-008-distutils-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} (100%)
rename package/python/{python-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} (97%)
rename package/python/{python-010-fix-python-config.patch => 010-fix-python-config.patch} (96%)
rename package/python/{python-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} (98%)
rename package/python/{python-012-support-library-path-old-compilers.patch => 012-support-library-path-old-compilers.patch} (97%)
rename package/python/{python-013-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} (98%)
rename package/python/{python-014-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} (97%)
rename package/python/{python-015-fix-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} (81%)
rename package/python/{python-016-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} (74%)
rename package/python/{python-017-distutils-scripts-dont-adjust-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python/{python-100-optional-test-modules.patch => 100-optional-test-modules.patch} (87%)
rename package/python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} (92%)
rename package/python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} (92%)
rename package/python/{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} (91%)
rename package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} (86%)
rename package/python/{python-105-optional-curses.patch => 105-optional-curses.patch} (91%)
rename package/python/{python-106-optional-expat.patch => 106-optional-expat.patch} (96%)
rename package/python/{python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (96%)
rename package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} (97%)
rename package/python/{python-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (96%)
rename package/python/{python-110-optional-db.patch => 110-optional-db.patch} (94%)
rename package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} (96%)
rename package/python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} (96%)
rename package/python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} (96%)
rename package/python/{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} (95%)
delete mode 100644 package/python/python-003-properly-detect-if-python-build.patch
rename package/python3/{python3-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (98%)
rename package/python3/{python3-002-properly-detect-if-python-build.patch => 002-properly-detect-if-python-build.patch} (98%)
rename package/python3/{python3-003-sysconfigdata-install-location.patch => 003-sysconfigdata-install-location.patch} (92%)
rename package/python3/{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} (97%)
rename package/python3/{python3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (98%)
rename package/python3/{python3-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (96%)
rename package/python3/{python3-007-disable-extensions.patch => 007-disable-extensions.patch} (97%)
rename package/python3/{python3-008-distutils-sysconfig-use-sysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} (69%)
rename package/python3/{python3-009-distutils-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} (99%)
rename package/python3/{python3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} (97%)
rename package/python3/{python3-011-support-library-path-old-compilers.patch => 011-support-library-path-old-compilers.patch} (97%)
rename package/python3/{python3-012-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} (97%)
rename package/python3/{python3-013-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} (97%)
rename package/python3/{python3-014-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} (100%)
rename package/python3/{python3-015-distutils-scripts-dont-adjust-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python3/{python3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} (100%)
rename package/python3/{python3-017-python-config-include-libdir.patch => 017-python-config-include-libdir.patch} (100%)
rename package/python3/{python3-100-optional-test-modules.patch => 100-optional-test-modules.patch} (98%)
rename package/python3/{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} (95%)
rename package/python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} (95%)
rename package/python3/{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} (94%)
rename package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} (94%)
rename package/python3/{python3-105-optional-curses.patch => 105-optional-curses.patch} (94%)
rename package/python3/{python3-106-optional-expat.patch => 106-optional-expat.patch} (96%)
rename package/python3/{python3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (96%)
rename package/python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} (97%)
rename package/python3/{python3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (96%)
rename package/python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} (95%)
rename package/python3/{python3-111-optional-decimal.patch => 111-optional-decimal.patch} (97%)
--
2.1.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] python3: bump to 3.4.2
2014-12-28 20:54 [Buildroot] [PATCH 0/4] Python and Python 3 version bumps Thomas Petazzoni
@ 2014-12-28 20:54 ` Thomas Petazzoni
2015-01-02 18:23 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 2/4] python3: rename patches to the new convention Thomas Petazzoni
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
This commit bumps python3 to Python 3.4.2. Two patches had to be
changed slightly to fix some minor conflicts.
PYTHON3_LIBTOOL_PATH = NO was added to prevent Buildroot from trying
to patch a version of libtool for which we don't have matching
patches, which isn't a problem since we're anyway not using the part
of the Python sources that uses libtool (it's the built-in copy of
libffi, and we use the external libffi).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 2 +-
.../python3-002-properly-detect-if-python-build.patch | 2 +-
.../python3-003-sysconfigdata-install-location.patch | 16 ++++++++--------
package/python3/python3-004-old-stdlib-cache.patch | 6 +++---
package/python3/python3-005-pyc-pyo-conditional.patch | 4 ++--
.../python3-006-cross-compile-getaddrinfo.patch | 2 +-
package/python3/python3-007-disable-extensions.patch | 10 +++++-----
...n3-008-distutils-sysconfig-use-sysconfigdata.patch | 19 +++++--------------
.../python3-009-distutils-use-python-sysroot.patch | 2 +-
.../python3/python3-010-no-termcap-host-path.patch | 2 +-
...thon3-011-support-library-path-old-compilers.patch | 6 +++---
.../python3/python3-012-dont-add-multiarch-path.patch | 2 +-
.../python3/python3-013-abort-on-failed-modules.patch | 2 +-
.../python3/python3-100-optional-test-modules.patch | 6 +++---
package/python3/python3-101-optional-pydoc.patch | 12 ++++++------
package/python3/python3-102-optional-2to3.patch | 14 +++++++-------
package/python3/python3-103-optional-sqlite.patch | 8 ++++----
package/python3/python3-104-optional-tk.patch | 8 ++++----
package/python3/python3-105-optional-curses.patch | 6 +++---
package/python3/python3-106-optional-expat.patch | 8 ++++----
package/python3/python3-107-optional-codecs-cjk.patch | 2 +-
package/python3/python3-108-optional-nis.patch | 2 +-
.../python3/python3-109-optional-unicodedata.patch | 2 +-
package/python3/python3-110-optional-idle.patch | 10 +++++-----
package/python3/python3-111-optional-decimal.patch | 4 ++--
package/python3/python3.mk | 9 ++++++++-
26 files changed, 82 insertions(+), 84 deletions(-)
--git a/package/python3/python3-001-remove-host-header-path.patch b/package/python3/python3-001-remove-host-header-path.patch
index e159e86..1eff608 100644
--- a/package/python3/python3-001-remove-host-header-path.patch
+++ b/package/python3/python3-001-remove-host-header-path.patch
@@ -24,7 +24,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -487,7 +487,8 @@
+@@ -493,7 +493,8 @@
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.base_prefix) != '/usr' \
diff --git a/package/python3/python3-002-properly-detect-if-python-build.patch b/package/python3/python3-002-properly-detect-if-python-build.patch
index ce874c6..e8ccd36 100644
--- a/package/python3/python3-002-properly-detect-if-python-build.patch
+++ b/package/python3/python3-002-properly-detect-if-python-build.patch
@@ -12,7 +12,7 @@ Index: b/Lib/distutils/command/build_ext.py
===================================================================
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
-@@ -246,7 +246,7 @@
+@@ -237,7 +237,7 @@
# Python's library directory must be appended to library_dirs
# See Issues: #1600860, #4366
if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
diff --git a/package/python3/python3-003-sysconfigdata-install-location.patch b/package/python3/python3-003-sysconfigdata-install-location.patch
index 1f230d4..dfcadf5 100644
--- a/package/python3/python3-003-sysconfigdata-install-location.patch
+++ b/package/python3/python3-003-sysconfigdata-install-location.patch
@@ -21,17 +21,17 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -543,6 +543,9 @@
- # sys.path fixup -- see Modules/getpath.c.
- pybuilddir.txt: $(BUILDPYTHON)
- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
+@@ -558,6 +558,9 @@
+ rm -f ./pybuilddir.txt ; \
+ exit 1 ; \
+ fi
+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
+ mkdir -p `cat pysysconfigdatadir.txt`
+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
# Build the shared modules
# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1181,7 +1184,7 @@
+@@ -1196,7 +1199,7 @@
else true; \
fi; \
done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1191,6 +1194,11 @@
+@@ -1206,6 +1209,11 @@
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1514,7 +1522,7 @@
+@@ -1529,7 +1537,7 @@
find build -name 'fficonfig.h' -exec rm -f {} ';' || true
find build -name '*.py' -exec rm -f {} ';' || true
find build -name '*.py[co]' -exec rm -f {} ';' || true
@@ -65,7 +65,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -67,7 +67,7 @@
+@@ -70,7 +70,7 @@
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
diff --git a/package/python3/python3-004-old-stdlib-cache.patch b/package/python3/python3-004-old-stdlib-cache.patch
index ac34f8d..4ed994d 100644
--- a/package/python3/python3-004-old-stdlib-cache.patch
+++ b/package/python3/python3-004-old-stdlib-cache.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -349,6 +349,23 @@
+@@ -352,6 +352,23 @@
AC_SUBST(FRAMEWORKUNIXTOOLSPREFIX)
AC_SUBST(FRAMEWORKINSTALLAPPSPREFIX)
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -157,6 +157,9 @@
+@@ -162,6 +162,9 @@
# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
@@ -50,7 +50,7 @@ Index: b/Makefile.pre.in
# Environment to run shared python without installed libraries
RUNSHARED= @RUNSHARED@
-@@ -1231,21 +1234,21 @@
+@@ -1246,21 +1249,21 @@
fi
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
diff --git a/package/python3/python3-005-pyc-pyo-conditional.patch b/package/python3/python3-005-pyc-pyo-conditional.patch
index 6b08c82..42dfa2f 100644
--- a/package/python3/python3-005-pyc-pyo-conditional.patch
+++ b/package/python3/python3-005-pyc-pyo-conditional.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1232,24 +1232,32 @@
+@@ -1247,24 +1247,32 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -39,7 +39,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -936,6 +936,18 @@
+@@ -939,6 +939,18 @@
AC_MSG_CHECKING(LDLIBRARY)
diff --git a/package/python3/python3-006-cross-compile-getaddrinfo.patch b/package/python3/python3-006-cross-compile-getaddrinfo.patch
index 7347be5..62a8aa4 100644
--- a/package/python3/python3-006-cross-compile-getaddrinfo.patch
+++ b/package/python3/python3-006-cross-compile-getaddrinfo.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -3412,7 +3412,7 @@
+@@ -3429,7 +3429,7 @@
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
diff --git a/package/python3/python3-007-disable-extensions.patch b/package/python3/python3-007-disable-extensions.patch
index 63c06b1..3b603f7 100644
--- a/package/python3/python3-007-disable-extensions.patch
+++ b/package/python3/python3-007-disable-extensions.patch
@@ -42,7 +42,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -175,6 +175,8 @@
+@@ -180,6 +180,8 @@
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -51,7 +51,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -561,6 +563,7 @@
+@@ -576,6 +578,7 @@
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -59,7 +59,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1371,7 +1374,8 @@
+@@ -1386,7 +1389,8 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -73,7 +73,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2349,6 +2349,8 @@
+@@ -2366,6 +2366,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
@@ -86,7 +86,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -33,7 +33,10 @@
+@@ -39,7 +39,10 @@
COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
# This global variable is used to hold the list of modules to be disabled.
diff --git a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch b/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
index c77fed3..d0758b1 100644
--- a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
+++ b/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
@@ -2,10 +2,11 @@ Index: b/Lib/distutils/sysconfig.py
===================================================================
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
-@@ -430,49 +430,11 @@
+@@ -423,40 +423,11 @@
+ _config_vars = None
def _init_posix():
- """Initialize the module as appropriate for POSIX systems."""
+- """Initialize the module as appropriate for POSIX systems."""
- g = {}
- # load the installed Makefile:
- try:
@@ -36,23 +37,13 @@ Index: b/Lib/distutils/sysconfig.py
- if python_build:
- g['LDSHARED'] = g['BLDSHARED']
-
-- elif get_python_version() < '2.1':
-- # The following two branches are for 1.5.2 compatibility.
-- if sys.platform == 'aix4': # what about AIX 3.x ?
-- # Linker script is in the config directory, not in Modules as the
-- # Makefile says.
-- python_lib = get_python_lib(standard_lib=1)
-- ld_so_aix = os.path.join(python_lib, 'config', 'ld_so_aix')
-- python_exp = os.path.join(python_lib, 'config', 'python.exp')
--
-- g['LDSHARED'] = "%s %s -bI:%s" % (ld_so_aix, g['CC'], python_exp)
--
+ # _sysconfigdata is generated@build time, see the sysconfig module
+ from _sysconfigdata import build_time_vars
global _config_vars
- _config_vars = g
+-
+ _config_vars = {}
+ _config_vars.update(build_time_vars)
-
def _init_nt():
+ """Initialize the module as appropriate for NT"""
diff --git a/package/python3/python3-009-distutils-use-python-sysroot.patch b/package/python3/python3-009-distutils-use-python-sysroot.patch
index cfe30fe..06f2039 100644
--- a/package/python3/python3-009-distutils-use-python-sysroot.patch
+++ b/package/python3/python3-009-distutils-use-python-sysroot.patch
@@ -43,7 +43,7 @@ Index: b/Lib/distutils/command/build_ext.py
===================================================================
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
-@@ -248,7 +248,10 @@
+@@ -239,7 +239,10 @@
if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
if not sysconfig.python_build:
# building third party extensions
diff --git a/package/python3/python3-010-no-termcap-host-path.patch b/package/python3/python3-010-no-termcap-host-path.patch
index 57fe47a..46c8a77 100644
--- a/package/python3/python3-010-no-termcap-host-path.patch
+++ b/package/python3/python3-010-no-termcap-host-path.patch
@@ -6,7 +6,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -725,12 +725,9 @@
+@@ -733,12 +733,9 @@
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
diff --git a/package/python3/python3-011-support-library-path-old-compilers.patch b/package/python3/python3-011-support-library-path-old-compilers.patch
index 4e0088a..296e9fe 100644
--- a/package/python3/python3-011-support-library-path-old-compilers.patch
+++ b/package/python3/python3-011-support-library-path-old-compilers.patch
@@ -20,7 +20,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -421,6 +421,7 @@
+@@ -427,6 +427,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
@@ -28,7 +28,7 @@ Index: b/setup.py
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
-@@ -432,6 +433,7 @@
+@@ -438,6 +439,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
@@ -36,7 +36,7 @@ Index: b/setup.py
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
-@@ -443,6 +445,15 @@
+@@ -449,6 +451,15 @@
finally:
os.unlink(tmpfile)
diff --git a/package/python3/python3-012-dont-add-multiarch-path.patch b/package/python3/python3-012-dont-add-multiarch-path.patch
index cfd88b2..6867b9a 100644
--- a/package/python3/python3-012-dont-add-multiarch-path.patch
+++ b/package/python3/python3-012-dont-add-multiarch-path.patch
@@ -14,7 +14,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -461,10 +461,10 @@
+@@ -467,10 +467,10 @@
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/package/python3/python3-013-abort-on-failed-modules.patch b/package/python3/python3-013-abort-on-failed-modules.patch
index c54c72e..5ad86fb 100644
--- a/package/python3/python3-013-abort-on-failed-modules.patch
+++ b/package/python3/python3-013-abort-on-failed-modules.patch
@@ -11,7 +11,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -278,6 +278,7 @@
+@@ -284,6 +284,7 @@
print("Failed to build these modules:")
print_three_column(failed)
print()
diff --git a/package/python3/python3-100-optional-test-modules.patch b/package/python3/python3-100-optional-test-modules.patch
index f6214d0..e3e81b7 100644
--- a/package/python3/python3-100-optional-test-modules.patch
+++ b/package/python3/python3-100-optional-test-modules.patch
@@ -15,7 +15,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1120,8 +1120,30 @@
+@@ -1135,8 +1135,30 @@
EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
test/audiodata \
test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1148,28 +1170,22 @@
+@@ -1163,28 +1185,22 @@
test/test_importlib/namespace_pkgs/project3/parent/child \
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
@@ -93,7 +93,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
+@@ -2673,6 +2673,12 @@
fi
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/python3-101-optional-pydoc.patch
index ddd5468..616ccb5 100644
--- a/package/python3/python3-101-optional-pydoc.patch
+++ b/package/python3/python3-101-optional-pydoc.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1087,7 +1087,9 @@
+@@ -1102,7 +1102,9 @@
-rm -f $(DESTDIR)$(BINDIR)/idle3
(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
@@ -26,7 +26,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/2to3
(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1138,7 +1140,7 @@
+@@ -1153,7 +1155,7 @@
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -35,7 +35,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
test test/test_asyncio \
-@@ -1182,6 +1184,10 @@
+@@ -1197,6 +1199,10 @@
test/test_importlib/import_ test/test_importlib/source \
unittest/test unittest/test/testmock
@@ -50,7 +50,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2655,6 +2655,11 @@
+@@ -2672,6 +2672,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -66,7 +66,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2203,6 +2203,12 @@
+@@ -2212,6 +2212,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -79,7 +79,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2227,8 +2233,7 @@
+@@ -2236,8 +2242,7 @@
# If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in
diff --git a/package/python3/python3-102-optional-2to3.patch b/package/python3/python3-102-optional-2to3.patch
index a23584f..cc010bc 100644
--- a/package/python3/python3-102-optional-2to3.patch
+++ b/package/python3/python3-102-optional-2to3.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1091,7 +1091,9 @@
+@@ -1106,7 +1106,9 @@
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
endif
-rm -f $(DESTDIR)$(BINDIR)/2to3
@@ -26,7 +26,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/pyvenv
(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1131,7 +1133,6 @@
+@@ -1146,7 +1148,6 @@
html json http dbm xmlrpc \
sqlite3 \
logging csv wsgiref urllib \
@@ -34,7 +34,7 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1173,9 +1174,6 @@
+@@ -1188,9 +1189,6 @@
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
sqlite3/test \
@@ -44,7 +44,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1188,6 +1186,14 @@
+@@ -1203,6 +1201,14 @@
LIBSUBDIRS += pydoc_data
endif
@@ -59,7 +59,7 @@ Index: b/Makefile.pre.in
ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS)
endif
-@@ -1283,10 +1289,12 @@
+@@ -1298,10 +1304,12 @@
-d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif
@@ -76,7 +76,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2204,10 +2204,11 @@
+@@ -2213,10 +2213,11 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -94,7 +94,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2667,6 +2667,12 @@
+@@ -2684,6 +2684,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/python3-103-optional-sqlite.patch
index e444301..f9cfeeb 100644
--- a/package/python3/python3-103-optional-sqlite.patch
+++ b/package/python3/python3-103-optional-sqlite.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2655,6 +2655,15 @@
+@@ -2672,6 +2672,15 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -32,7 +32,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1131,7 +1131,6 @@
+@@ -1146,7 +1146,6 @@
email email/mime \
ensurepip ensurepip/_bundled \
html json http dbm xmlrpc \
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -1173,7 +1172,6 @@
+@@ -1188,7 +1187,6 @@
test/test_importlib/namespace_pkgs/project3/parent/child \
test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -1194,6 +1192,11 @@
+@@ -1209,6 +1207,11 @@
lib2to3/tests/data/fixers/myfixes
endif
diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/python3-104-optional-tk.patch
index 0d15fe1..7d67204 100644
--- a/package/python3/python3-104-optional-tk.patch
+++ b/package/python3/python3-104-optional-tk.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1124,7 +1124,7 @@
+@@ -1139,7 +1139,7 @@
EXTRAPLATDIR= @EXTRAPLATDIR@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax
@@ -21,7 +21,7 @@ Index: b/Makefile.pre.in
site-packages \
asyncio \
collections concurrent concurrent/futures encodings \
-@@ -1142,8 +1142,7 @@
+@@ -1157,8 +1157,7 @@
venv venv/scripts venv/scripts/posix \
curses $(MACHDEPS)
@@ -31,7 +31,7 @@ Index: b/Makefile.pre.in
test/test_email test/test_email/data \
test/test_json \
test/audiodata \
-@@ -1197,6 +1196,12 @@
+@@ -1212,6 +1211,12 @@
TESTSUBDIRS += sqlite3/test
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2664,6 +2664,15 @@
+@@ -2681,6 +2681,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/python3-105-optional-curses.patch b/package/python3/python3-105-optional-curses.patch
index 8e63908..b61528e 100644
--- a/package/python3/python3-105-optional-curses.patch
+++ b/package/python3/python3-105-optional-curses.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1140,7 +1140,7 @@
+@@ -1155,7 +1155,7 @@
multiprocessing multiprocessing/dummy \
unittest \
venv venv/scripts venv/scripts/posix \
@@ -21,7 +21,7 @@ Index: b/Makefile.pre.in
TESTSUBDIRS = test test/test_asyncio \
test/test_email test/test_email/data \
-@@ -1202,6 +1202,10 @@
+@@ -1217,6 +1217,10 @@
tkinter/test/test_ttk
endif
@@ -36,7 +36,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2673,6 +2673,15 @@
+@@ -2690,6 +2690,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
diff --git a/package/python3/python3-106-optional-expat.patch b/package/python3/python3-106-optional-expat.patch
index ce1eb2a..c05e4e9 100644
--- a/package/python3/python3-106-optional-expat.patch
+++ b/package/python3/python3-106-optional-expat.patch
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1134,7 +1134,7 @@
+@@ -1149,7 +1149,7 @@
logging csv wsgiref urllib \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +28,7 @@ Index: b/Makefile.pre.in
importlib \
turtledemo \
multiprocessing multiprocessing/dummy \
-@@ -1206,6 +1206,10 @@
+@@ -1221,6 +1221,10 @@
LIBSUBDIRS += curses
endif
@@ -43,7 +43,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2352,13 +2352,21 @@
+@@ -2369,13 +2369,21 @@
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -74,7 +74,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1417,7 +1417,7 @@
+@@ -1426,7 +1426,7 @@
#
# More information on Expat can be found at www.libexpat.org.
#
diff --git a/package/python3/python3-107-optional-codecs-cjk.patch b/package/python3/python3-107-optional-codecs-cjk.patch
index 0f261fc..5d26c91 100644
--- a/package/python3/python3-107-optional-codecs-cjk.patch
+++ b/package/python3/python3-107-optional-codecs-cjk.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2672,6 +2672,12 @@
+@@ -2689,6 +2689,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python3/python3-108-optional-nis.patch b/package/python3/python3-108-optional-nis.patch
index de6057c..58dcc1e 100644
--- a/package/python3/python3-108-optional-nis.patch
+++ b/package/python3/python3-108-optional-nis.patch
@@ -13,7 +13,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2678,6 +2678,12 @@
+@@ -2695,6 +2695,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
fi])
diff --git a/package/python3/python3-109-optional-unicodedata.patch b/package/python3/python3-109-optional-unicodedata.patch
index 46e9a6f..939ce34 100644
--- a/package/python3/python3-109-optional-unicodedata.patch
+++ b/package/python3/python3-109-optional-unicodedata.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2684,6 +2684,12 @@
+@@ -2701,6 +2701,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python3/python3-110-optional-idle.patch b/package/python3/python3-110-optional-idle.patch
index 4d5e70b..555f5ef 100644
--- a/package/python3/python3-110-optional-idle.patch
+++ b/package/python3/python3-110-optional-idle.patch
@@ -15,7 +15,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1085,7 +1085,9 @@
+@@ -1100,7 +1100,9 @@
-rm -f $(DESTDIR)$(LIBPC)/python3.pc
(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
-rm -f $(DESTDIR)$(BINDIR)/idle3
@@ -25,7 +25,7 @@ Index: b/Makefile.pre.in
-rm -f $(DESTDIR)$(BINDIR)/pydoc3
ifeq (@PYDOC@,yes)
(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1133,7 +1135,6 @@
+@@ -1148,7 +1150,6 @@
html json http dbm xmlrpc \
logging csv wsgiref urllib \
ctypes ctypes/macholib \
@@ -33,7 +33,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
importlib \
turtledemo \
-@@ -1210,6 +1211,10 @@
+@@ -1225,6 +1226,10 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2726,6 +2726,12 @@
+@@ -2743,6 +2743,12 @@
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
@@ -65,7 +65,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2204,11 +2204,13 @@
+@@ -2213,11 +2213,13 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python3/python3-111-optional-decimal.patch b/package/python3/python3-111-optional-decimal.patch
index d895ee5..c325ce2 100644
--- a/package/python3/python3-111-optional-decimal.patch
+++ b/package/python3/python3-111-optional-decimal.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2385,13 +2385,20 @@
+@@ -2402,13 +2402,20 @@
AC_MSG_RESULT($with_system_ffi)
# Check for use of the system libmpdec library
@@ -42,7 +42,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1972,7 +1972,7 @@
+@@ -1980,7 +1980,7 @@
def _decimal_ext(self):
extra_compile_args = []
undef_macros = []
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 5c72c6e..f6663dc 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -5,12 +5,19 @@
################################################################################
PYTHON3_VERSION_MAJOR = 3.4
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python software foundation license v2, others
PYTHON3_LICENSE_FILES = LICENSE
+# Python itself doesn't use libtool, but it includes the source code
+# of libffi, which uses libtool. Unfortunately, it uses a beta version
+# of libtool for which we don't have a matching patch. However, this
+# is not a problem, because we don't use the libffi copy included in
+# the Python sources, but instead use an external libffi library.
+PYTHON3_LIBTOOL_PATCH = NO
+
# Python needs itself and a "pgen" program to build itself, both being
# provided in the Python sources. So in order to cross-compile Python,
# we need to build a host Python first. This host Python is also
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] python3: rename patches to the new convention
2014-12-28 20:54 [Buildroot] [PATCH 0/4] Python and Python 3 version bumps Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 1/4] python3: bump to 3.4.2 Thomas Petazzoni
@ 2014-12-28 20:54 ` Thomas Petazzoni
2015-01-02 18:24 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 3/4] python: bump to 2.7.9 Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 4/4] python: rename patches to the new convention Thomas Petazzoni
3 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
Now that we don't use completely sequential numbers, because patches
below 100 are used to address cross-compilation issues in Python 3,
while patches above 100 are used to make more Python 3 modules
configurable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...01-remove-host-header-path.patch => 001-remove-host-header-path.patch} | 0
...ct-if-python-build.patch => 002-properly-detect-if-python-build.patch} | 0
...ta-install-location.patch => 003-sysconfigdata-install-location.patch} | 0
.../{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} | 0
...ython3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} | 0
...ross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} | 0
...{python3-007-disable-extensions.patch => 007-disable-extensions.patch} | 0
...ysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} | 0
...ls-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} | 0
...hon3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} | 0
...h-old-compilers.patch => 011-support-library-path-old-compilers.patch} | 0
...12-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} | 0
...13-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} | 0
...14-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} | 0
...just-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} | 0
...hon3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} | 0
...config-include-libdir.patch => 017-python-config-include-libdir.patch} | 0
...n3-100-optional-test-modules.patch => 100-optional-test-modules.patch} | 0
.../{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} | 0
.../python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} | 0
.../{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} | 0
package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} | 0
.../{python3-105-optional-curses.patch => 105-optional-curses.patch} | 0
.../{python3-106-optional-expat.patch => 106-optional-expat.patch} | 0
...ython3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} | 0
.../python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} | 0
...hon3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} | 0
.../python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} | 0
.../{python3-111-optional-decimal.patch => 111-optional-decimal.patch} | 0
29 files changed, 0 insertions(+), 0 deletions(-)
rename package/python3/{python3-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (100%)
rename package/python3/{python3-002-properly-detect-if-python-build.patch => 002-properly-detect-if-python-build.patch} (100%)
rename package/python3/{python3-003-sysconfigdata-install-location.patch => 003-sysconfigdata-install-location.patch} (100%)
rename package/python3/{python3-004-old-stdlib-cache.patch => 004-old-stdlib-cache.patch} (100%)
rename package/python3/{python3-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (100%)
rename package/python3/{python3-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (100%)
rename package/python3/{python3-007-disable-extensions.patch => 007-disable-extensions.patch} (100%)
rename package/python3/{python3-008-distutils-sysconfig-use-sysconfigdata.patch => 008-distutils-sysconfig-use-sysconfigdata.patch} (100%)
rename package/python3/{python3-009-distutils-use-python-sysroot.patch => 009-distutils-use-python-sysroot.patch} (100%)
rename package/python3/{python3-010-no-termcap-host-path.patch => 010-no-termcap-host-path.patch} (100%)
rename package/python3/{python3-011-support-library-path-old-compilers.patch => 011-support-library-path-old-compilers.patch} (100%)
rename package/python3/{python3-012-dont-add-multiarch-path.patch => 012-dont-add-multiarch-path.patch} (100%)
rename package/python3/{python3-013-abort-on-failed-modules.patch => 013-abort-on-failed-modules.patch} (100%)
rename package/python3/{python3-014-serial-ioctl-workaround.patch => 014-serial-ioctl-workaround.patch} (100%)
rename package/python3/{python3-015-distutils-scripts-dont-adjust-shebang.patch => 015-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python3/{python3-016-distutils-no-pep3147.patch => 016-distutils-no-pep3147.patch} (100%)
rename package/python3/{python3-017-python-config-include-libdir.patch => 017-python-config-include-libdir.patch} (100%)
rename package/python3/{python3-100-optional-test-modules.patch => 100-optional-test-modules.patch} (100%)
rename package/python3/{python3-101-optional-pydoc.patch => 101-optional-pydoc.patch} (100%)
rename package/python3/{python3-102-optional-2to3.patch => 102-optional-2to3.patch} (100%)
rename package/python3/{python3-103-optional-sqlite.patch => 103-optional-sqlite.patch} (100%)
rename package/python3/{python3-104-optional-tk.patch => 104-optional-tk.patch} (100%)
rename package/python3/{python3-105-optional-curses.patch => 105-optional-curses.patch} (100%)
rename package/python3/{python3-106-optional-expat.patch => 106-optional-expat.patch} (100%)
rename package/python3/{python3-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (100%)
rename package/python3/{python3-108-optional-nis.patch => 108-optional-nis.patch} (100%)
rename package/python3/{python3-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (100%)
rename package/python3/{python3-110-optional-idle.patch => 110-optional-idle.patch} (100%)
rename package/python3/{python3-111-optional-decimal.patch => 111-optional-decimal.patch} (100%)
diff --git a/package/python3/python3-001-remove-host-header-path.patch b/package/python3/001-remove-host-header-path.patch
similarity index 100%
rename from package/python3/python3-001-remove-host-header-path.patch
rename to package/python3/001-remove-host-header-path.patch
diff --git a/package/python3/python3-002-properly-detect-if-python-build.patch b/package/python3/002-properly-detect-if-python-build.patch
similarity index 100%
rename from package/python3/python3-002-properly-detect-if-python-build.patch
rename to package/python3/002-properly-detect-if-python-build.patch
diff --git a/package/python3/python3-003-sysconfigdata-install-location.patch b/package/python3/003-sysconfigdata-install-location.patch
similarity index 100%
rename from package/python3/python3-003-sysconfigdata-install-location.patch
rename to package/python3/003-sysconfigdata-install-location.patch
diff --git a/package/python3/python3-004-old-stdlib-cache.patch b/package/python3/004-old-stdlib-cache.patch
similarity index 100%
rename from package/python3/python3-004-old-stdlib-cache.patch
rename to package/python3/004-old-stdlib-cache.patch
diff --git a/package/python3/python3-005-pyc-pyo-conditional.patch b/package/python3/005-pyc-pyo-conditional.patch
similarity index 100%
rename from package/python3/python3-005-pyc-pyo-conditional.patch
rename to package/python3/005-pyc-pyo-conditional.patch
diff --git a/package/python3/python3-006-cross-compile-getaddrinfo.patch b/package/python3/006-cross-compile-getaddrinfo.patch
similarity index 100%
rename from package/python3/python3-006-cross-compile-getaddrinfo.patch
rename to package/python3/006-cross-compile-getaddrinfo.patch
diff --git a/package/python3/python3-007-disable-extensions.patch b/package/python3/007-disable-extensions.patch
similarity index 100%
rename from package/python3/python3-007-disable-extensions.patch
rename to package/python3/007-disable-extensions.patch
diff --git a/package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch b/package/python3/008-distutils-sysconfig-use-sysconfigdata.patch
similarity index 100%
rename from package/python3/python3-008-distutils-sysconfig-use-sysconfigdata.patch
rename to package/python3/008-distutils-sysconfig-use-sysconfigdata.patch
diff --git a/package/python3/python3-009-distutils-use-python-sysroot.patch b/package/python3/009-distutils-use-python-sysroot.patch
similarity index 100%
rename from package/python3/python3-009-distutils-use-python-sysroot.patch
rename to package/python3/009-distutils-use-python-sysroot.patch
diff --git a/package/python3/python3-010-no-termcap-host-path.patch b/package/python3/010-no-termcap-host-path.patch
similarity index 100%
rename from package/python3/python3-010-no-termcap-host-path.patch
rename to package/python3/010-no-termcap-host-path.patch
diff --git a/package/python3/python3-011-support-library-path-old-compilers.patch b/package/python3/011-support-library-path-old-compilers.patch
similarity index 100%
rename from package/python3/python3-011-support-library-path-old-compilers.patch
rename to package/python3/011-support-library-path-old-compilers.patch
diff --git a/package/python3/python3-012-dont-add-multiarch-path.patch b/package/python3/012-dont-add-multiarch-path.patch
similarity index 100%
rename from package/python3/python3-012-dont-add-multiarch-path.patch
rename to package/python3/012-dont-add-multiarch-path.patch
diff --git a/package/python3/python3-013-abort-on-failed-modules.patch b/package/python3/013-abort-on-failed-modules.patch
similarity index 100%
rename from package/python3/python3-013-abort-on-failed-modules.patch
rename to package/python3/013-abort-on-failed-modules.patch
diff --git a/package/python3/python3-014-serial-ioctl-workaround.patch b/package/python3/014-serial-ioctl-workaround.patch
similarity index 100%
rename from package/python3/python3-014-serial-ioctl-workaround.patch
rename to package/python3/014-serial-ioctl-workaround.patch
diff --git a/package/python3/python3-015-distutils-scripts-dont-adjust-shebang.patch b/package/python3/015-distutils-scripts-dont-adjust-shebang.patch
similarity index 100%
rename from package/python3/python3-015-distutils-scripts-dont-adjust-shebang.patch
rename to package/python3/015-distutils-scripts-dont-adjust-shebang.patch
diff --git a/package/python3/python3-016-distutils-no-pep3147.patch b/package/python3/016-distutils-no-pep3147.patch
similarity index 100%
rename from package/python3/python3-016-distutils-no-pep3147.patch
rename to package/python3/016-distutils-no-pep3147.patch
diff --git a/package/python3/python3-017-python-config-include-libdir.patch b/package/python3/017-python-config-include-libdir.patch
similarity index 100%
rename from package/python3/python3-017-python-config-include-libdir.patch
rename to package/python3/017-python-config-include-libdir.patch
diff --git a/package/python3/python3-100-optional-test-modules.patch b/package/python3/100-optional-test-modules.patch
similarity index 100%
rename from package/python3/python3-100-optional-test-modules.patch
rename to package/python3/100-optional-test-modules.patch
diff --git a/package/python3/python3-101-optional-pydoc.patch b/package/python3/101-optional-pydoc.patch
similarity index 100%
rename from package/python3/python3-101-optional-pydoc.patch
rename to package/python3/101-optional-pydoc.patch
diff --git a/package/python3/python3-102-optional-2to3.patch b/package/python3/102-optional-2to3.patch
similarity index 100%
rename from package/python3/python3-102-optional-2to3.patch
rename to package/python3/102-optional-2to3.patch
diff --git a/package/python3/python3-103-optional-sqlite.patch b/package/python3/103-optional-sqlite.patch
similarity index 100%
rename from package/python3/python3-103-optional-sqlite.patch
rename to package/python3/103-optional-sqlite.patch
diff --git a/package/python3/python3-104-optional-tk.patch b/package/python3/104-optional-tk.patch
similarity index 100%
rename from package/python3/python3-104-optional-tk.patch
rename to package/python3/104-optional-tk.patch
diff --git a/package/python3/python3-105-optional-curses.patch b/package/python3/105-optional-curses.patch
similarity index 100%
rename from package/python3/python3-105-optional-curses.patch
rename to package/python3/105-optional-curses.patch
diff --git a/package/python3/python3-106-optional-expat.patch b/package/python3/106-optional-expat.patch
similarity index 100%
rename from package/python3/python3-106-optional-expat.patch
rename to package/python3/106-optional-expat.patch
diff --git a/package/python3/python3-107-optional-codecs-cjk.patch b/package/python3/107-optional-codecs-cjk.patch
similarity index 100%
rename from package/python3/python3-107-optional-codecs-cjk.patch
rename to package/python3/107-optional-codecs-cjk.patch
diff --git a/package/python3/python3-108-optional-nis.patch b/package/python3/108-optional-nis.patch
similarity index 100%
rename from package/python3/python3-108-optional-nis.patch
rename to package/python3/108-optional-nis.patch
diff --git a/package/python3/python3-109-optional-unicodedata.patch b/package/python3/109-optional-unicodedata.patch
similarity index 100%
rename from package/python3/python3-109-optional-unicodedata.patch
rename to package/python3/109-optional-unicodedata.patch
diff --git a/package/python3/python3-110-optional-idle.patch b/package/python3/110-optional-idle.patch
similarity index 100%
rename from package/python3/python3-110-optional-idle.patch
rename to package/python3/110-optional-idle.patch
diff --git a/package/python3/python3-111-optional-decimal.patch b/package/python3/111-optional-decimal.patch
similarity index 100%
rename from package/python3/python3-111-optional-decimal.patch
rename to package/python3/111-optional-decimal.patch
--
2.1.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] python: bump to 2.7.9
2014-12-28 20:54 [Buildroot] [PATCH 0/4] Python and Python 3 version bumps Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 1/4] python3: bump to 3.4.2 Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 2/4] python3: rename patches to the new convention Thomas Petazzoni
@ 2014-12-28 20:54 ` Thomas Petazzoni
2015-01-02 18:15 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 4/4] python: rename patches to the new convention Thomas Petazzoni
3 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
In addition to doing the bump, this commit also:
- Refreshes all the patches
- Removes python-003-properly-detect-if-python-build.patch, which has
been applied upstream.
- Passes the --without-ensurepip option, like is done in Python 3, to
avoid having Python use PIP to automatically download stuff when it
is being built.
- PYTHON_LIBTOOL_PATH = NO is added to prevent Buildroot from trying
to patch a version of libtool for which we don't have matching
patches, which isn't a problem since we're anyway not using the
part of the Python sources that uses libtool (it's the built-in
copy of libffi, and we use the external libffi).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
| 2 +-
...ython-003-properly-detect-if-python-build.patch | 23 ----------------------
...python-004-sysconfigdata-install-location.patch | 22 ++++++++++-----------
.../python/python-005-pyc-pyo-conditional.patch | 4 ++--
.../python-006-cross-compile-getaddrinfo.patch | 2 +-
package/python/python-007-disable-extensions.patch | 8 ++++----
.../python/python-009-no-termcap-host-path.patch | 2 +-
package/python/python-010-fix-python-config.patch | 20 +++++++++----------
.../python/python-011-remove-python-symlink.patch | 2 +-
...on-012-support-library-path-old-compilers.patch | 6 +++---
.../python-013-dont-add-multiarch-path.patch | 2 +-
.../python-014-abort-on-failed-modules.patch | 2 +-
.../python-015-fix-sqlite-without-threads.patch | 7 ++++---
.../python-016-serial-ioctl-workaround.patch | 7 ++++---
.../python/python-100-optional-test-modules.patch | 17 ++++++++--------
package/python/python-101-optional-pydoc.patch | 12 +++++------
package/python/python-102-optional-2to3.patch | 14 ++++++-------
package/python/python-103-optional-sqlite.patch | 12 +++++------
package/python/python-104-optional-tk.patch | 14 ++++++-------
package/python/python-105-optional-curses.patch | 8 ++++----
package/python/python-106-optional-expat.patch | 8 ++++----
.../python/python-107-optional-codecs-cjk.patch | 2 +-
package/python/python-108-optional-nis.patch | 2 +-
.../python/python-109-optional-unicodedata.patch | 2 +-
package/python/python-110-optional-db.patch | 10 +++++-----
package/python/python-111-optional-ssl.patch | 2 +-
package/python/python-112-optional-bzip2.patch | 2 +-
package/python/python-113-optional-zlib.patch | 2 +-
package/python/python-114-remove-idle-editor.patch | 6 +++---
package/python/python.mk | 3 ++-
30 files changed, 103 insertions(+), 122 deletions(-)
delete mode 100644 package/python/python-003-properly-detect-if-python-build.patch
--git a/package/python/python-001-remove-host-header-path.patch b/package/python/python-001-remove-host-header-path.patch
index 206751d..dfb84ff 100644
--- a/package/python/python-001-remove-host-header-path.patch
+++ b/package/python/python-001-remove-host-header-path.patch
@@ -21,7 +21,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -478,7 +478,7 @@
+@@ -480,7 +480,7 @@
for directory in reversed(options.dirs):
add_dir_to_list(dir_list, directory)
diff --git a/package/python/python-003-properly-detect-if-python-build.patch b/package/python/python-003-properly-detect-if-python-build.patch
deleted file mode 100644
index 3fb865f..0000000
--- a/package/python/python-003-properly-detect-if-python-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-distutils: fix build_ext check to find whether we're building Python or not
-
-The build_ext logic uses
-sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")) to
-determine whether we're building a third-party Python extension, or a
-built-in Python extension. However, this check is wrong in
-cross-compilation mode, and instead, the sysconfig.python_build
-variable should be used.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -235,7 +235,7 @@
- # Python's library directory must be appended to library_dirs
- # See Issues: #1600860, #4366
- if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-- if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
-+ if not sysconfig.python_build:
- # building third party extensions
- self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
- else:
diff --git a/package/python/python-004-sysconfigdata-install-location.patch b/package/python/python-004-sysconfigdata-install-location.patch
index e053de3..a72db1a 100644
--- a/package/python/python-004-sysconfigdata-install-location.patch
+++ b/package/python/python-004-sysconfigdata-install-location.patch
@@ -21,17 +21,17 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -449,6 +449,9 @@
- # sys.path fixup -- see Modules/getpath.c.
- pybuilddir.txt: $(BUILDPYTHON)
- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars
-+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
-+ mkdir -p `cat pysysconfigdatadir.txt`
-+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
+@@ -462,6 +462,9 @@
+ rm -f ./pybuilddir.txt ; \
+ exit 1 ; \
+ fi
++ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
++ mkdir -p `cat pysysconfigdatadir.txt`
++ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
# Build the shared modules
# Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -969,7 +972,7 @@
+@@ -1002,7 +1005,7 @@
else true; \
fi; \
done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in
do \
if test -x $$i; then \
$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -979,6 +982,11 @@
+@@ -1012,6 +1015,11 @@
echo $(INSTALL_DATA) $$i $(LIBDEST); \
fi; \
done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \
do \
a=$(srcdir)/Lib/$$d; \
-@@ -1304,7 +1312,7 @@
+@@ -1337,7 +1345,7 @@
Modules/Setup Modules/Setup.local Modules/Setup.config \
Modules/ld_so_aix Modules/python.exp Misc/python.pc
-rm -f python*-gdb.py
@@ -65,7 +65,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -30,7 +30,7 @@
+@@ -33,7 +33,7 @@
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
fi
AC_MSG_RESULT($interp)
diff --git a/package/python/python-005-pyc-pyo-conditional.patch b/package/python/python-005-pyc-pyo-conditional.patch
index fbcdaa6..0a2f727 100644
--- a/package/python/python-005-pyc-pyo-conditional.patch
+++ b/package/python/python-005-pyc-pyo-conditional.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1017,24 +1017,32 @@
+@@ -1050,24 +1050,32 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -39,7 +39,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -733,6 +733,17 @@
+@@ -736,6 +736,17 @@
;;
esac
diff --git a/package/python/python-006-cross-compile-getaddrinfo.patch b/package/python/python-006-cross-compile-getaddrinfo.patch
index ff05095..ba6e6f0 100644
--- a/package/python/python-006-cross-compile-getaddrinfo.patch
+++ b/package/python/python-006-cross-compile-getaddrinfo.patch
@@ -2,7 +2,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -3343,7 +3343,7 @@
+@@ -3346,7 +3346,7 @@
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
diff --git a/package/python/python-007-disable-extensions.patch b/package/python/python-007-disable-extensions.patch
index 40ed6df..be4d943 100644
--- a/package/python/python-007-disable-extensions.patch
+++ b/package/python/python-007-disable-extensions.patch
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -153,6 +153,8 @@
+@@ -156,6 +156,8 @@
# configure script arguments
CONFIG_ARGS= @CONFIG_ARGS@
@@ -11,7 +11,7 @@ Index: b/Makefile.pre.in
# Subdirectories with code
SRCDIRS= @SRCDIRS@
-@@ -464,6 +466,7 @@
+@@ -477,6 +479,7 @@
esac; \
$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
# Build static library
-@@ -1158,7 +1161,8 @@
+@@ -1191,7 +1194,8 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -33,7 +33,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2281,6 +2281,8 @@
+@@ -2284,6 +2284,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
diff --git a/package/python/python-009-no-termcap-host-path.patch b/package/python/python-009-no-termcap-host-path.patch
index fadc7b3..781e179 100644
--- a/package/python/python-009-no-termcap-host-path.patch
+++ b/package/python/python-009-no-termcap-host-path.patch
@@ -7,7 +7,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -762,12 +762,9 @@
+@@ -764,12 +764,9 @@
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
readline_libs.append(curses_library)
diff --git a/package/python/python-010-fix-python-config.patch b/package/python/python-010-fix-python-config.patch
index 97ff157..2beb233 100644
--- a/package/python/python-010-fix-python-config.patch
+++ b/package/python/python-010-fix-python-config.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -879,6 +879,7 @@
+@@ -882,6 +882,7 @@
# Other platforms follow
if test $enable_shared = "yes"; then
@@ -18,7 +18,7 @@ Index: b/configure.ac
AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
case $ac_sys_system in
BeOS*)
-@@ -939,6 +940,7 @@
+@@ -942,6 +943,7 @@
esac
else # shared is disabled
@@ -26,7 +26,7 @@ Index: b/configure.ac
case $ac_sys_system in
CYGWIN*)
BLDLIBRARY='$(LIBRARY)'
-@@ -1915,6 +1917,9 @@
+@@ -1918,6 +1920,9 @@
AC_SUBST(BLDSHARED)
AC_SUBST(CCSHARED)
AC_SUBST(LINKFORSHARED)
@@ -36,8 +36,8 @@ Index: b/configure.ac
# SO is the extension of shared libraries `(including the dot!)
# -- usually .so, .sl on HP-UX, .dll on Cygwin
AC_MSG_CHECKING(SO)
-@@ -4563,7 +4568,7 @@
- AC_MSG_RESULT(done)
+@@ -4581,7 +4586,7 @@
+ AC_SUBST(ENSUREPIP)
# generate output files
-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
@@ -49,7 +49,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -163,7 +163,7 @@
+@@ -166,7 +166,7 @@
SUBDIRSTOO= Include Lib Misc Demo
# Files and directories to be distributed
@@ -58,7 +58,7 @@ Index: b/Makefile.pre.in
DISTFILES= README ChangeLog $(CONFIGFILES)
DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
DIST= $(DISTFILES) $(DISTDIRS)
-@@ -407,7 +407,7 @@
+@@ -410,7 +410,7 @@
# Default target
all: build_all
@@ -67,7 +67,7 @@ Index: b/Makefile.pre.in
# Compile a binary with gcc profile guided optimization.
profile-opt:
-@@ -1068,10 +1068,12 @@
+@@ -1101,10 +1101,12 @@
fi; \
cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -82,7 +82,7 @@ Index: b/Makefile.pre.in
# Install the include files
INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1130,7 +1132,7 @@
+@@ -1163,7 +1165,7 @@
$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -91,7 +91,7 @@ Index: b/Makefile.pre.in
@if [ -s Modules/python.exp -a \
"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1312,6 +1314,7 @@
+@@ -1345,6 +1347,7 @@
config.cache config.log pyconfig.h Modules/config.c
-rm -rf build platform
-rm -rf $(PYTHONFRAMEWORKDIR)
diff --git a/package/python/python-011-remove-python-symlink.patch b/package/python/python-011-remove-python-symlink.patch
index af0a296..b0548c3 100644
--- a/package/python/python-011-remove-python-symlink.patch
+++ b/package/python/python-011-remove-python-symlink.patch
@@ -10,7 +10,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -858,17 +858,10 @@
+@@ -890,17 +890,10 @@
# $(PYTHON) -> python2 -> python$(VERSION))
# Also create equivalent chains for other installed files
bininstall: altbininstall
diff --git a/package/python/python-012-support-library-path-old-compilers.patch b/package/python/python-012-support-library-path-old-compilers.patch
index 6c48d1b..9803821 100644
--- a/package/python/python-012-support-library-path-old-compilers.patch
+++ b/package/python/python-012-support-library-path-old-compilers.patch
@@ -20,7 +20,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -416,6 +416,7 @@
+@@ -418,6 +418,7 @@
in_incdirs = False
inc_dirs = []
lib_dirs = []
@@ -28,7 +28,7 @@ Index: b/setup.py
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
-@@ -427,6 +428,7 @@
+@@ -429,6 +430,7 @@
elif line.startswith("End of search list"):
in_incdirs = False
elif is_gcc and line.startswith("LIBRARY_PATH"):
@@ -36,7 +36,7 @@ Index: b/setup.py
for d in line.strip().split("=")[1].split(":"):
d = os.path.normpath(d)
if '/gcc/' not in d:
-@@ -438,6 +440,15 @@
+@@ -440,6 +442,15 @@
finally:
os.unlink(tmpfile)
diff --git a/package/python/python-013-dont-add-multiarch-path.patch b/package/python/python-013-dont-add-multiarch-path.patch
index 0ab38ac..24e7af9 100644
--- a/package/python/python-013-dont-add-multiarch-path.patch
+++ b/package/python/python-013-dont-add-multiarch-path.patch
@@ -14,7 +14,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -454,9 +454,9 @@
+@@ -456,9 +456,9 @@
if not cross_compiling:
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
diff --git a/package/python/python-014-abort-on-failed-modules.patch b/package/python/python-014-abort-on-failed-modules.patch
index 2031e20..4bceeb6 100644
--- a/package/python/python-014-abort-on-failed-modules.patch
+++ b/package/python/python-014-abort-on-failed-modules.patch
@@ -11,7 +11,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -281,6 +281,7 @@
+@@ -283,6 +283,7 @@
print "Failed to build these modules:"
print_three_column(failed)
print
diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/python-015-fix-sqlite-without-threads.patch
index 805edff..f51c37b 100644
--- a/package/python/python-015-fix-sqlite-without-threads.patch
+++ b/package/python/python-015-fix-sqlite-without-threads.patch
@@ -35,9 +35,10 @@ is never the last statement of the function.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -durN python-2.7.8.orig/Modules/_sqlite/connection.c python-2.7.8/Modules/_sqlite/connection.c
---- python-2.7.8.orig/Modules/_sqlite/connection.c 2014-06-30 04:05:42.000000000 +0200
-+++ python-2.7.8/Modules/_sqlite/connection.c 2014-07-12 13:53:32.258041224 +0200
+Index: b/Modules/_sqlite/connection.c
+===================================================================
+--- a/Modules/_sqlite/connection.c
++++ b/Modules/_sqlite/connection.c
@@ -786,6 +786,7 @@
#ifdef WITH_THREAD
PyGILState_Release(threadstate);
diff --git a/package/python/python-016-serial-ioctl-workaround.patch b/package/python/python-016-serial-ioctl-workaround.patch
index 9ff775f..80ed65e 100644
--- a/package/python/python-016-serial-ioctl-workaround.patch
+++ b/package/python/python-016-serial-ioctl-workaround.patch
@@ -8,9 +8,10 @@ but isn't actually referenced in modern kernels.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
-diff -Nuar Python-2.7.8-orig/Modules/termios.c Python-2.7.8/Modules/termios.c
---- Python-2.7.8-orig/Modules/termios.c 2014-06-30 05:05:44.000000000 +0300
-+++ Python-2.7.8/Modules/termios.c 2014-07-18 06:16:43.393010357 +0300
+Index: b/Modules/termios.c
+===================================================================
+--- a/Modules/termios.c
++++ b/Modules/termios.c
@@ -16,7 +16,9 @@
* so this needs to be included first on that platform. */
#include <termio.h>
diff --git a/package/python/python-100-optional-test-modules.patch b/package/python/python-100-optional-test-modules.patch
index 33bc5f8..1180b29 100644
--- a/package/python/python-100-optional-test-modules.patch
+++ b/package/python/python-100-optional-test-modules.patch
@@ -15,19 +15,21 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -928,26 +928,42 @@
+@@ -960,27 +960,43 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
-LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \
-- lib-tk/test/test_ttk site-packages test test/audiodata test/data \
-- test/cjkencodings test/decimaltestdata test/xmltestdata \
+- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
+- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
- test/imghdrdata \
- test/subprocessdata \
- test/tracedmodules \
+LIBSUBDIRS= lib-tk site-packages \
encodings compiler hotshot \
- email email/mime email/test email/test/data \
++ email email/mime \
+ ensurepip ensurepip/_bundled \
- json json/tests \
- sqlite3 sqlite3/test \
- logging bsddb bsddb/test csv importlib wsgiref \
@@ -36,9 +38,8 @@ Index: b/Makefile.pre.in
- ctypes ctypes/test ctypes/macholib \
- idlelib idlelib/Icons idlelib/idle_test \
- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-+ email email/mime \
+ json \
-+ sqlite3 \
++ sqlite3 \
+ logging bsddb csv importlib wsgiref \
+ lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ ctypes ctypes/macholib \
@@ -51,7 +52,7 @@ Index: b/Makefile.pre.in
curses pydoc_data $(MACHDEPS)
+
+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-+ lib-tk/test/test_ttk test test/audiodata test/data \
++ lib-tk/test/test_ttk test test/audiodata test/capath test/data \
+ test/cjkencodings test/decimaltestdata test/xmltestdata \
+ test/imghdrdata \
+ test/subprocessdata \
@@ -61,7 +62,7 @@ Index: b/Makefile.pre.in
+ sqlite3/test \
+ bsddb/test \
+ lib2to3/tests \
-+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
++ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+ ctypes/test \
+ idlelib/idle_test \
+ distutils/tests \
@@ -78,7 +79,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2625,6 +2625,12 @@
+@@ -2628,6 +2628,12 @@
fi
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/python-101-optional-pydoc.patch
index cb8631a..d5dc3d7 100644
--- a/package/python/python-101-optional-pydoc.patch
+++ b/package/python/python-101-optional-pydoc.patch
@@ -16,7 +16,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -941,7 +941,7 @@
+@@ -974,7 +974,7 @@
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
@@ -24,8 +24,8 @@ Index: b/Makefile.pre.in
+ curses $(MACHDEPS)
TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- lib-tk/test/test_ttk test test/audiodata test/data \
-@@ -964,6 +964,10 @@
+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \
+@@ -997,6 +997,10 @@
LIBSUBDIRS += $(TESTSUBDIRS)
endif
@@ -40,7 +40,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2624,6 +2624,11 @@
+@@ -2627,6 +2627,11 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -56,7 +56,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2219,6 +2219,12 @@
+@@ -2222,6 +2222,12 @@
# turn off warnings when deprecated modules are imported
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -69,7 +69,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301)
name = "Python",
version = sys.version.split()[0],
-@@ -2239,9 +2245,7 @@
+@@ -2242,9 +2248,7 @@
ext_modules=[Extension('_struct', ['_struct.c'])],
# Scripts to install
diff --git a/package/python/python-102-optional-2to3.patch b/package/python/python-102-optional-2to3.patch
index 0d23ca3..76edfa1 100644
--- a/package/python/python-102-optional-2to3.patch
+++ b/package/python/python-102-optional-2to3.patch
@@ -16,24 +16,24 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -934,7 +934,6 @@
+@@ -967,7 +967,6 @@
json \
- sqlite3 \
+ sqlite3 \
logging bsddb csv importlib wsgiref \
- lib2to3 lib2to3/fixes lib2to3/pgen2 \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -953,8 +952,6 @@
+@@ -986,8 +985,6 @@
json/tests \
sqlite3/test \
bsddb/test \
- lib2to3/tests \
-- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -968,6 +965,14 @@
+@@ -1001,6 +998,14 @@
LIBSUBDIRS += pydoc_data
endif
@@ -52,7 +52,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2636,6 +2636,12 @@
+@@ -2639,6 +2639,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -69,7 +69,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2220,10 +2220,11 @@
+@@ -2223,10 +2223,11 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python/python-103-optional-sqlite.patch b/package/python/python-103-optional-sqlite.patch
index 1e17530..eb43c7a 100644
--- a/package/python/python-103-optional-sqlite.patch
+++ b/package/python/python-103-optional-sqlite.patch
@@ -12,7 +12,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2624,6 +2624,15 @@
+@@ -2627,6 +2627,15 @@
AC_CHECK_FUNCS(pthread_atfork)
fi
@@ -32,15 +32,15 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -932,7 +932,6 @@
- encodings compiler hotshot \
+@@ -965,7 +965,6 @@
email email/mime \
+ ensurepip ensurepip/_bundled \
json \
-- sqlite3 \
+- sqlite3 \
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
-@@ -950,7 +949,6 @@
+@@ -983,7 +982,6 @@
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -48,7 +48,7 @@ Index: b/Makefile.pre.in
bsddb/test \
ctypes/test \
idlelib/idle_test \
-@@ -973,6 +971,11 @@
+@@ -1006,6 +1004,11 @@
lib2to3/tests/data/fixers/myfixes
endif
diff --git a/package/python/python-104-optional-tk.patch b/package/python/python-104-optional-tk.patch
index 298c91d..f402e42 100644
--- a/package/python/python-104-optional-tk.patch
+++ b/package/python/python-104-optional-tk.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -928,7 +928,7 @@
+@@ -960,7 +960,7 @@
plat-mac/lib-scriptpackages/SystemEvents \
plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
@@ -20,18 +20,18 @@ Index: b/Makefile.pre.in
+LIBSUBDIRS= site-packages \
encodings compiler hotshot \
email email/mime \
- json \
-@@ -941,8 +941,7 @@
+ ensurepip ensurepip/_bundled \
+@@ -974,8 +974,7 @@
lib-old \
curses $(MACHDEPS)
-TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-- lib-tk/test/test_ttk test test/audiodata test/data \
-+TESTSUBDIRS = test test/audiodata test/data \
+- lib-tk/test/test_ttk test test/audiodata test/capath test/data \
++TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
test/imghdrdata \
test/subprocessdata \
-@@ -976,6 +975,12 @@
+@@ -1009,6 +1008,12 @@
TESTSUBDIRS += sqlite3/test
endif
@@ -48,7 +48,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2633,6 +2633,15 @@
+@@ -2636,6 +2636,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python/python-105-optional-curses.patch b/package/python/python-105-optional-curses.patch
index 00f2266..a73fb04 100644
--- a/package/python/python-105-optional-curses.patch
+++ b/package/python/python-105-optional-curses.patch
@@ -12,16 +12,16 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -939,7 +939,7 @@
+@@ -972,7 +972,7 @@
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
- curses $(MACHDEPS)
+ $(MACHDEPS)
- TESTSUBDIRS = test test/audiodata test/data \
+ TESTSUBDIRS = test test/audiodata test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -981,6 +981,10 @@
+@@ -1014,6 +1014,10 @@
lib-tk/test/test_ttk
endif
@@ -36,7 +36,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2642,6 +2642,15 @@
+@@ -2645,6 +2645,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi
diff --git a/package/python/python-106-optional-expat.patch b/package/python/python-106-optional-expat.patch
index d80dee4..1ee117c 100644
--- a/package/python/python-106-optional-expat.patch
+++ b/package/python/python-106-optional-expat.patch
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -935,7 +935,7 @@
+@@ -968,7 +968,7 @@
logging bsddb csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
@@ -28,7 +28,7 @@ Index: b/Makefile.pre.in
multiprocessing multiprocessing/dummy \
unittest \
lib-old \
-@@ -985,6 +985,10 @@
+@@ -1018,6 +1018,10 @@
LIBSUBDIRS += curses
endif
@@ -43,7 +43,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2289,13 +2289,21 @@
+@@ -2292,13 +2292,21 @@
AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library
@@ -74,7 +74,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -1471,7 +1471,7 @@
+@@ -1474,7 +1474,7 @@
#
# More information on Expat can be found at www.libexpat.org.
#
diff --git a/package/python/python-107-optional-codecs-cjk.patch b/package/python/python-107-optional-codecs-cjk.patch
index 132b4bd..6329b0c 100644
--- a/package/python/python-107-optional-codecs-cjk.patch
+++ b/package/python/python-107-optional-codecs-cjk.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2641,6 +2641,12 @@
+@@ -2644,6 +2644,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi
diff --git a/package/python/python-108-optional-nis.patch b/package/python/python-108-optional-nis.patch
index 12aa2f1..f07bbb6 100644
--- a/package/python/python-108-optional-nis.patch
+++ b/package/python/python-108-optional-nis.patch
@@ -13,7 +13,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2647,6 +2647,12 @@
+@@ -2650,6 +2650,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
fi])
diff --git a/package/python/python-109-optional-unicodedata.patch b/package/python/python-109-optional-unicodedata.patch
index 99a0daa..10da1ea 100644
--- a/package/python/python-109-optional-unicodedata.patch
+++ b/package/python/python-109-optional-unicodedata.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,12 @@
+@@ -2656,6 +2656,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-110-optional-db.patch b/package/python/python-110-optional-db.patch
index baee963..4b54e24 100644
--- a/package/python/python-110-optional-db.patch
+++ b/package/python/python-110-optional-db.patch
@@ -16,16 +16,16 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -932,7 +932,7 @@
- encodings compiler hotshot \
+@@ -965,7 +965,7 @@
email email/mime \
+ ensurepip ensurepip/_bundled \
json \
- logging bsddb csv importlib wsgiref \
+ logging csv importlib wsgiref \
ctypes ctypes/macholib \
idlelib idlelib/Icons \
distutils distutils/command \
-@@ -948,7 +948,6 @@
+@@ -981,7 +981,6 @@
test/tracedmodules \
email/test email/test/data \
json/tests \
@@ -33,7 +33,7 @@ Index: b/Makefile.pre.in
ctypes/test \
idlelib/idle_test \
distutils/tests \
-@@ -989,6 +988,11 @@
+@@ -1022,6 +1021,11 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif
@@ -49,7 +49,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,28 @@
+@@ -2656,6 +2656,28 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-111-optional-ssl.patch b/package/python/python-111-optional-ssl.patch
index 5b20747..72891cd 100644
--- a/package/python/python-111-optional-ssl.patch
+++ b/package/python/python-111-optional-ssl.patch
@@ -10,7 +10,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2653,6 +2653,12 @@
+@@ -2656,6 +2656,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi])
diff --git a/package/python/python-112-optional-bzip2.patch b/package/python/python-112-optional-bzip2.patch
index eeb3303..3a646e1 100644
--- a/package/python/python-112-optional-bzip2.patch
+++ b/package/python/python-112-optional-bzip2.patch
@@ -9,7 +9,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2659,6 +2659,12 @@
+@@ -2662,6 +2662,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
fi])
diff --git a/package/python/python-113-optional-zlib.patch b/package/python/python-113-optional-zlib.patch
index b93c983..a4ca8bd 100644
--- a/package/python/python-113-optional-zlib.patch
+++ b/package/python/python-113-optional-zlib.patch
@@ -9,7 +9,7 @@ Index: b/configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -2665,6 +2665,12 @@
+@@ -2668,6 +2668,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
fi])
diff --git a/package/python/python-114-remove-idle-editor.patch b/package/python/python-114-remove-idle-editor.patch
index 9aba15c..67b9050 100644
--- a/package/python/python-114-remove-idle-editor.patch
+++ b/package/python/python-114-remove-idle-editor.patch
@@ -12,7 +12,7 @@ Index: b/Makefile.pre.in
===================================================================
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -934,7 +934,6 @@
+@@ -967,7 +967,6 @@
json \
logging csv importlib wsgiref \
ctypes ctypes/macholib \
@@ -20,7 +20,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \
multiprocessing multiprocessing/dummy \
unittest \
-@@ -949,7 +948,6 @@
+@@ -982,7 +981,6 @@
email/test email/test/data \
json/tests \
ctypes/test \
@@ -32,7 +32,7 @@ Index: b/setup.py
===================================================================
--- a/setup.py
+++ b/setup.py
-@@ -2220,7 +2220,7 @@
+@@ -2223,7 +2223,7 @@
import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning)
diff --git a/package/python/python.mk b/package/python/python.mk
index 3db31d3..45b1f7f 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -5,11 +5,12 @@
################################################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).9
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_LICENSE = Python software foundation license v2, others
PYTHON_LICENSE_FILES = LICENSE
+PYTHON_LIBTOOL_PATCH = NO
# Python needs itself to be built, so in order to cross-compile
# Python, we need to build a host Python first. This host Python is
--
2.1.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] python: rename patches to the new convention
2014-12-28 20:54 [Buildroot] [PATCH 0/4] Python and Python 3 version bumps Thomas Petazzoni
` (2 preceding siblings ...)
2014-12-28 20:54 ` [Buildroot] [PATCH 3/4] python: bump to 2.7.9 Thomas Petazzoni
@ 2014-12-28 20:54 ` Thomas Petazzoni
2015-01-02 18:16 ` Yann E. MORIN
3 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni @ 2014-12-28 20:54 UTC (permalink / raw)
To: buildroot
Now that we don't use completely sequential numbers, because patches
below 100 are used to address cross-compilation issues in Python,
while patches above 100 are used to make more Python modules
configurable.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...01-remove-host-header-path.patch => 001-remove-host-header-path.patch} | 0
.../{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} | 0
...ta-install-location.patch => 004-sysconfigdata-install-location.patch} | 0
...python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} | 0
...ross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} | 0
.../{python-007-disable-extensions.patch => 007-disable-extensions.patch} | 0
...ls-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} | 0
...thon-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} | 0
.../{python-010-fix-python-config.patch => 010-fix-python-config.patch} | 0
...on-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} | 0
...h-old-compilers.patch => 012-support-library-path-old-compilers.patch} | 0
...13-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} | 0
...14-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} | 0
...-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} | 0
...16-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} | 0
...just-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} | 0
...on-100-optional-test-modules.patch => 100-optional-test-modules.patch} | 0
.../python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} | 0
.../python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} | 0
.../{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} | 0
package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} | 0
.../{python-105-optional-curses.patch => 105-optional-curses.patch} | 0
.../python/{python-106-optional-expat.patch => 106-optional-expat.patch} | 0
...python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} | 0
package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} | 0
...thon-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} | 0
package/python/{python-110-optional-db.patch => 110-optional-db.patch} | 0
package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} | 0
.../python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} | 0
.../python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} | 0
.../{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} | 0
31 files changed, 0 insertions(+), 0 deletions(-)
rename package/python/{python-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (100%)
rename package/python/{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} (100%)
rename package/python/{python-004-sysconfigdata-install-location.patch => 004-sysconfigdata-install-location.patch} (100%)
rename package/python/{python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (100%)
rename package/python/{python-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (100%)
rename package/python/{python-007-disable-extensions.patch => 007-disable-extensions.patch} (100%)
rename package/python/{python-008-distutils-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} (100%)
rename package/python/{python-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} (100%)
rename package/python/{python-010-fix-python-config.patch => 010-fix-python-config.patch} (100%)
rename package/python/{python-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} (100%)
rename package/python/{python-012-support-library-path-old-compilers.patch => 012-support-library-path-old-compilers.patch} (100%)
rename package/python/{python-013-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} (100%)
rename package/python/{python-014-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} (100%)
rename package/python/{python-015-fix-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} (100%)
rename package/python/{python-016-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} (100%)
rename package/python/{python-017-distutils-scripts-dont-adjust-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} (100%)
rename package/python/{python-100-optional-test-modules.patch => 100-optional-test-modules.patch} (100%)
rename package/python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} (100%)
rename package/python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} (100%)
rename package/python/{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} (100%)
rename package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} (100%)
rename package/python/{python-105-optional-curses.patch => 105-optional-curses.patch} (100%)
rename package/python/{python-106-optional-expat.patch => 106-optional-expat.patch} (100%)
rename package/python/{python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (100%)
rename package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} (100%)
rename package/python/{python-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (100%)
rename package/python/{python-110-optional-db.patch => 110-optional-db.patch} (100%)
rename package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} (100%)
rename package/python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} (100%)
rename package/python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} (100%)
rename package/python/{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} (100%)
diff --git a/package/python/python-001-remove-host-header-path.patch b/package/python/001-remove-host-header-path.patch
similarity index 100%
rename from package/python/python-001-remove-host-header-path.patch
rename to package/python/001-remove-host-header-path.patch
diff --git a/package/python/python-002-fix-get-python-inc.patch b/package/python/002-fix-get-python-inc.patch
similarity index 100%
rename from package/python/python-002-fix-get-python-inc.patch
rename to package/python/002-fix-get-python-inc.patch
diff --git a/package/python/python-004-sysconfigdata-install-location.patch b/package/python/004-sysconfigdata-install-location.patch
similarity index 100%
rename from package/python/python-004-sysconfigdata-install-location.patch
rename to package/python/004-sysconfigdata-install-location.patch
diff --git a/package/python/python-005-pyc-pyo-conditional.patch b/package/python/005-pyc-pyo-conditional.patch
similarity index 100%
rename from package/python/python-005-pyc-pyo-conditional.patch
rename to package/python/005-pyc-pyo-conditional.patch
diff --git a/package/python/python-006-cross-compile-getaddrinfo.patch b/package/python/006-cross-compile-getaddrinfo.patch
similarity index 100%
rename from package/python/python-006-cross-compile-getaddrinfo.patch
rename to package/python/006-cross-compile-getaddrinfo.patch
diff --git a/package/python/python-007-disable-extensions.patch b/package/python/007-disable-extensions.patch
similarity index 100%
rename from package/python/python-007-disable-extensions.patch
rename to package/python/007-disable-extensions.patch
diff --git a/package/python/python-008-distutils-use-python-sysroot.patch b/package/python/008-distutils-use-python-sysroot.patch
similarity index 100%
rename from package/python/python-008-distutils-use-python-sysroot.patch
rename to package/python/008-distutils-use-python-sysroot.patch
diff --git a/package/python/python-009-no-termcap-host-path.patch b/package/python/009-no-termcap-host-path.patch
similarity index 100%
rename from package/python/python-009-no-termcap-host-path.patch
rename to package/python/009-no-termcap-host-path.patch
diff --git a/package/python/python-010-fix-python-config.patch b/package/python/010-fix-python-config.patch
similarity index 100%
rename from package/python/python-010-fix-python-config.patch
rename to package/python/010-fix-python-config.patch
diff --git a/package/python/python-011-remove-python-symlink.patch b/package/python/011-remove-python-symlink.patch
similarity index 100%
rename from package/python/python-011-remove-python-symlink.patch
rename to package/python/011-remove-python-symlink.patch
diff --git a/package/python/python-012-support-library-path-old-compilers.patch b/package/python/012-support-library-path-old-compilers.patch
similarity index 100%
rename from package/python/python-012-support-library-path-old-compilers.patch
rename to package/python/012-support-library-path-old-compilers.patch
diff --git a/package/python/python-013-dont-add-multiarch-path.patch b/package/python/013-dont-add-multiarch-path.patch
similarity index 100%
rename from package/python/python-013-dont-add-multiarch-path.patch
rename to package/python/013-dont-add-multiarch-path.patch
diff --git a/package/python/python-014-abort-on-failed-modules.patch b/package/python/014-abort-on-failed-modules.patch
similarity index 100%
rename from package/python/python-014-abort-on-failed-modules.patch
rename to package/python/014-abort-on-failed-modules.patch
diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/015-fix-sqlite-without-threads.patch
similarity index 100%
rename from package/python/python-015-fix-sqlite-without-threads.patch
rename to package/python/015-fix-sqlite-without-threads.patch
diff --git a/package/python/python-016-serial-ioctl-workaround.patch b/package/python/016-serial-ioctl-workaround.patch
similarity index 100%
rename from package/python/python-016-serial-ioctl-workaround.patch
rename to package/python/016-serial-ioctl-workaround.patch
diff --git a/package/python/python-017-distutils-scripts-dont-adjust-shebang.patch b/package/python/017-distutils-scripts-dont-adjust-shebang.patch
similarity index 100%
rename from package/python/python-017-distutils-scripts-dont-adjust-shebang.patch
rename to package/python/017-distutils-scripts-dont-adjust-shebang.patch
diff --git a/package/python/python-100-optional-test-modules.patch b/package/python/100-optional-test-modules.patch
similarity index 100%
rename from package/python/python-100-optional-test-modules.patch
rename to package/python/100-optional-test-modules.patch
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/101-optional-pydoc.patch
similarity index 100%
rename from package/python/python-101-optional-pydoc.patch
rename to package/python/101-optional-pydoc.patch
diff --git a/package/python/python-102-optional-2to3.patch b/package/python/102-optional-2to3.patch
similarity index 100%
rename from package/python/python-102-optional-2to3.patch
rename to package/python/102-optional-2to3.patch
diff --git a/package/python/python-103-optional-sqlite.patch b/package/python/103-optional-sqlite.patch
similarity index 100%
rename from package/python/python-103-optional-sqlite.patch
rename to package/python/103-optional-sqlite.patch
diff --git a/package/python/python-104-optional-tk.patch b/package/python/104-optional-tk.patch
similarity index 100%
rename from package/python/python-104-optional-tk.patch
rename to package/python/104-optional-tk.patch
diff --git a/package/python/python-105-optional-curses.patch b/package/python/105-optional-curses.patch
similarity index 100%
rename from package/python/python-105-optional-curses.patch
rename to package/python/105-optional-curses.patch
diff --git a/package/python/python-106-optional-expat.patch b/package/python/106-optional-expat.patch
similarity index 100%
rename from package/python/python-106-optional-expat.patch
rename to package/python/106-optional-expat.patch
diff --git a/package/python/python-107-optional-codecs-cjk.patch b/package/python/107-optional-codecs-cjk.patch
similarity index 100%
rename from package/python/python-107-optional-codecs-cjk.patch
rename to package/python/107-optional-codecs-cjk.patch
diff --git a/package/python/python-108-optional-nis.patch b/package/python/108-optional-nis.patch
similarity index 100%
rename from package/python/python-108-optional-nis.patch
rename to package/python/108-optional-nis.patch
diff --git a/package/python/python-109-optional-unicodedata.patch b/package/python/109-optional-unicodedata.patch
similarity index 100%
rename from package/python/python-109-optional-unicodedata.patch
rename to package/python/109-optional-unicodedata.patch
diff --git a/package/python/python-110-optional-db.patch b/package/python/110-optional-db.patch
similarity index 100%
rename from package/python/python-110-optional-db.patch
rename to package/python/110-optional-db.patch
diff --git a/package/python/python-111-optional-ssl.patch b/package/python/111-optional-ssl.patch
similarity index 100%
rename from package/python/python-111-optional-ssl.patch
rename to package/python/111-optional-ssl.patch
diff --git a/package/python/python-112-optional-bzip2.patch b/package/python/112-optional-bzip2.patch
similarity index 100%
rename from package/python/python-112-optional-bzip2.patch
rename to package/python/112-optional-bzip2.patch
diff --git a/package/python/python-113-optional-zlib.patch b/package/python/113-optional-zlib.patch
similarity index 100%
rename from package/python/python-113-optional-zlib.patch
rename to package/python/113-optional-zlib.patch
diff --git a/package/python/python-114-remove-idle-editor.patch b/package/python/114-remove-idle-editor.patch
similarity index 100%
rename from package/python/python-114-remove-idle-editor.patch
rename to package/python/114-remove-idle-editor.patch
--
2.1.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] python: bump to 2.7.9
2014-12-28 20:54 ` [Buildroot] [PATCH 3/4] python: bump to 2.7.9 Thomas Petazzoni
@ 2015-01-02 18:15 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-01-02 18:15 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-12-28 21:54 +0100, Thomas Petazzoni spake thusly:
> In addition to doing the bump, this commit also:
>
> - Refreshes all the patches
> - Removes python-003-properly-detect-if-python-build.patch, which has
> been applied upstream.
> - Passes the --without-ensurepip option, like is done in Python 3, to
> avoid having Python use PIP to automatically download stuff when it
> is being built.
> - PYTHON_LIBTOOL_PATH = NO is added to prevent Buildroot from trying
> to patch a version of libtool for which we don't have matching
> patches, which isn't a problem since we're anyway not using the
> part of the Python sources that uses libtool (it's the built-in
> copy of libffi, and we use the external libffi).
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[run-time tested to at least print("Hello World\n") properly]
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] python: rename patches to the new convention
2014-12-28 20:54 ` [Buildroot] [PATCH 4/4] python: rename patches to the new convention Thomas Petazzoni
@ 2015-01-02 18:16 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-01-02 18:16 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-12-28 21:54 +0100, Thomas Petazzoni spake thusly:
> Now that we don't use completely sequential numbers, because patches
> below 100 are used to address cross-compilation issues in Python,
> while patches above 100 are used to make more Python modules
> configurable.
I'm not sure this is a proper sentence. ;-)
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> ...01-remove-host-header-path.patch => 001-remove-host-header-path.patch} | 0
> .../{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} | 0
> ...ta-install-location.patch => 004-sysconfigdata-install-location.patch} | 0
> ...python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} | 0
> ...ross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} | 0
> .../{python-007-disable-extensions.patch => 007-disable-extensions.patch} | 0
> ...ls-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} | 0
> ...thon-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} | 0
> .../{python-010-fix-python-config.patch => 010-fix-python-config.patch} | 0
> ...on-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} | 0
> ...h-old-compilers.patch => 012-support-library-path-old-compilers.patch} | 0
> ...13-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} | 0
> ...14-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} | 0
> ...-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} | 0
> ...16-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} | 0
> ...just-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} | 0
> ...on-100-optional-test-modules.patch => 100-optional-test-modules.patch} | 0
> .../python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} | 0
> .../python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} | 0
> .../{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} | 0
> package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} | 0
> .../{python-105-optional-curses.patch => 105-optional-curses.patch} | 0
> .../python/{python-106-optional-expat.patch => 106-optional-expat.patch} | 0
> ...python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} | 0
> package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} | 0
> ...thon-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} | 0
> package/python/{python-110-optional-db.patch => 110-optional-db.patch} | 0
> package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} | 0
> .../python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} | 0
> .../python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} | 0
> .../{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} | 0
> 31 files changed, 0 insertions(+), 0 deletions(-)
> rename package/python/{python-001-remove-host-header-path.patch => 001-remove-host-header-path.patch} (100%)
> rename package/python/{python-002-fix-get-python-inc.patch => 002-fix-get-python-inc.patch} (100%)
> rename package/python/{python-004-sysconfigdata-install-location.patch => 004-sysconfigdata-install-location.patch} (100%)
> rename package/python/{python-005-pyc-pyo-conditional.patch => 005-pyc-pyo-conditional.patch} (100%)
> rename package/python/{python-006-cross-compile-getaddrinfo.patch => 006-cross-compile-getaddrinfo.patch} (100%)
> rename package/python/{python-007-disable-extensions.patch => 007-disable-extensions.patch} (100%)
> rename package/python/{python-008-distutils-use-python-sysroot.patch => 008-distutils-use-python-sysroot.patch} (100%)
> rename package/python/{python-009-no-termcap-host-path.patch => 009-no-termcap-host-path.patch} (100%)
> rename package/python/{python-010-fix-python-config.patch => 010-fix-python-config.patch} (100%)
> rename package/python/{python-011-remove-python-symlink.patch => 011-remove-python-symlink.patch} (100%)
> rename package/python/{python-012-support-library-path-old-compilers.patch => 012-support-library-path-old-compilers.patch} (100%)
> rename package/python/{python-013-dont-add-multiarch-path.patch => 013-dont-add-multiarch-path.patch} (100%)
> rename package/python/{python-014-abort-on-failed-modules.patch => 014-abort-on-failed-modules.patch} (100%)
> rename package/python/{python-015-fix-sqlite-without-threads.patch => 015-fix-sqlite-without-threads.patch} (100%)
> rename package/python/{python-016-serial-ioctl-workaround.patch => 016-serial-ioctl-workaround.patch} (100%)
> rename package/python/{python-017-distutils-scripts-dont-adjust-shebang.patch => 017-distutils-scripts-dont-adjust-shebang.patch} (100%)
> rename package/python/{python-100-optional-test-modules.patch => 100-optional-test-modules.patch} (100%)
> rename package/python/{python-101-optional-pydoc.patch => 101-optional-pydoc.patch} (100%)
> rename package/python/{python-102-optional-2to3.patch => 102-optional-2to3.patch} (100%)
> rename package/python/{python-103-optional-sqlite.patch => 103-optional-sqlite.patch} (100%)
> rename package/python/{python-104-optional-tk.patch => 104-optional-tk.patch} (100%)
> rename package/python/{python-105-optional-curses.patch => 105-optional-curses.patch} (100%)
> rename package/python/{python-106-optional-expat.patch => 106-optional-expat.patch} (100%)
> rename package/python/{python-107-optional-codecs-cjk.patch => 107-optional-codecs-cjk.patch} (100%)
> rename package/python/{python-108-optional-nis.patch => 108-optional-nis.patch} (100%)
> rename package/python/{python-109-optional-unicodedata.patch => 109-optional-unicodedata.patch} (100%)
> rename package/python/{python-110-optional-db.patch => 110-optional-db.patch} (100%)
> rename package/python/{python-111-optional-ssl.patch => 111-optional-ssl.patch} (100%)
> rename package/python/{python-112-optional-bzip2.patch => 112-optional-bzip2.patch} (100%)
> rename package/python/{python-113-optional-zlib.patch => 113-optional-zlib.patch} (100%)
> rename package/python/{python-114-remove-idle-editor.patch => 114-remove-idle-editor.patch} (100%)
>
> diff --git a/package/python/python-001-remove-host-header-path.patch b/package/python/001-remove-host-header-path.patch
> similarity index 100%
> rename from package/python/python-001-remove-host-header-path.patch
> rename to package/python/001-remove-host-header-path.patch
> diff --git a/package/python/python-002-fix-get-python-inc.patch b/package/python/002-fix-get-python-inc.patch
> similarity index 100%
> rename from package/python/python-002-fix-get-python-inc.patch
> rename to package/python/002-fix-get-python-inc.patch
> diff --git a/package/python/python-004-sysconfigdata-install-location.patch b/package/python/004-sysconfigdata-install-location.patch
> similarity index 100%
> rename from package/python/python-004-sysconfigdata-install-location.patch
> rename to package/python/004-sysconfigdata-install-location.patch
> diff --git a/package/python/python-005-pyc-pyo-conditional.patch b/package/python/005-pyc-pyo-conditional.patch
> similarity index 100%
> rename from package/python/python-005-pyc-pyo-conditional.patch
> rename to package/python/005-pyc-pyo-conditional.patch
> diff --git a/package/python/python-006-cross-compile-getaddrinfo.patch b/package/python/006-cross-compile-getaddrinfo.patch
> similarity index 100%
> rename from package/python/python-006-cross-compile-getaddrinfo.patch
> rename to package/python/006-cross-compile-getaddrinfo.patch
> diff --git a/package/python/python-007-disable-extensions.patch b/package/python/007-disable-extensions.patch
> similarity index 100%
> rename from package/python/python-007-disable-extensions.patch
> rename to package/python/007-disable-extensions.patch
> diff --git a/package/python/python-008-distutils-use-python-sysroot.patch b/package/python/008-distutils-use-python-sysroot.patch
> similarity index 100%
> rename from package/python/python-008-distutils-use-python-sysroot.patch
> rename to package/python/008-distutils-use-python-sysroot.patch
> diff --git a/package/python/python-009-no-termcap-host-path.patch b/package/python/009-no-termcap-host-path.patch
> similarity index 100%
> rename from package/python/python-009-no-termcap-host-path.patch
> rename to package/python/009-no-termcap-host-path.patch
> diff --git a/package/python/python-010-fix-python-config.patch b/package/python/010-fix-python-config.patch
> similarity index 100%
> rename from package/python/python-010-fix-python-config.patch
> rename to package/python/010-fix-python-config.patch
> diff --git a/package/python/python-011-remove-python-symlink.patch b/package/python/011-remove-python-symlink.patch
> similarity index 100%
> rename from package/python/python-011-remove-python-symlink.patch
> rename to package/python/011-remove-python-symlink.patch
> diff --git a/package/python/python-012-support-library-path-old-compilers.patch b/package/python/012-support-library-path-old-compilers.patch
> similarity index 100%
> rename from package/python/python-012-support-library-path-old-compilers.patch
> rename to package/python/012-support-library-path-old-compilers.patch
> diff --git a/package/python/python-013-dont-add-multiarch-path.patch b/package/python/013-dont-add-multiarch-path.patch
> similarity index 100%
> rename from package/python/python-013-dont-add-multiarch-path.patch
> rename to package/python/013-dont-add-multiarch-path.patch
> diff --git a/package/python/python-014-abort-on-failed-modules.patch b/package/python/014-abort-on-failed-modules.patch
> similarity index 100%
> rename from package/python/python-014-abort-on-failed-modules.patch
> rename to package/python/014-abort-on-failed-modules.patch
> diff --git a/package/python/python-015-fix-sqlite-without-threads.patch b/package/python/015-fix-sqlite-without-threads.patch
> similarity index 100%
> rename from package/python/python-015-fix-sqlite-without-threads.patch
> rename to package/python/015-fix-sqlite-without-threads.patch
> diff --git a/package/python/python-016-serial-ioctl-workaround.patch b/package/python/016-serial-ioctl-workaround.patch
> similarity index 100%
> rename from package/python/python-016-serial-ioctl-workaround.patch
> rename to package/python/016-serial-ioctl-workaround.patch
> diff --git a/package/python/python-017-distutils-scripts-dont-adjust-shebang.patch b/package/python/017-distutils-scripts-dont-adjust-shebang.patch
> similarity index 100%
> rename from package/python/python-017-distutils-scripts-dont-adjust-shebang.patch
> rename to package/python/017-distutils-scripts-dont-adjust-shebang.patch
> diff --git a/package/python/python-100-optional-test-modules.patch b/package/python/100-optional-test-modules.patch
> similarity index 100%
> rename from package/python/python-100-optional-test-modules.patch
> rename to package/python/100-optional-test-modules.patch
> diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/101-optional-pydoc.patch
> similarity index 100%
> rename from package/python/python-101-optional-pydoc.patch
> rename to package/python/101-optional-pydoc.patch
> diff --git a/package/python/python-102-optional-2to3.patch b/package/python/102-optional-2to3.patch
> similarity index 100%
> rename from package/python/python-102-optional-2to3.patch
> rename to package/python/102-optional-2to3.patch
> diff --git a/package/python/python-103-optional-sqlite.patch b/package/python/103-optional-sqlite.patch
> similarity index 100%
> rename from package/python/python-103-optional-sqlite.patch
> rename to package/python/103-optional-sqlite.patch
> diff --git a/package/python/python-104-optional-tk.patch b/package/python/104-optional-tk.patch
> similarity index 100%
> rename from package/python/python-104-optional-tk.patch
> rename to package/python/104-optional-tk.patch
> diff --git a/package/python/python-105-optional-curses.patch b/package/python/105-optional-curses.patch
> similarity index 100%
> rename from package/python/python-105-optional-curses.patch
> rename to package/python/105-optional-curses.patch
> diff --git a/package/python/python-106-optional-expat.patch b/package/python/106-optional-expat.patch
> similarity index 100%
> rename from package/python/python-106-optional-expat.patch
> rename to package/python/106-optional-expat.patch
> diff --git a/package/python/python-107-optional-codecs-cjk.patch b/package/python/107-optional-codecs-cjk.patch
> similarity index 100%
> rename from package/python/python-107-optional-codecs-cjk.patch
> rename to package/python/107-optional-codecs-cjk.patch
> diff --git a/package/python/python-108-optional-nis.patch b/package/python/108-optional-nis.patch
> similarity index 100%
> rename from package/python/python-108-optional-nis.patch
> rename to package/python/108-optional-nis.patch
> diff --git a/package/python/python-109-optional-unicodedata.patch b/package/python/109-optional-unicodedata.patch
> similarity index 100%
> rename from package/python/python-109-optional-unicodedata.patch
> rename to package/python/109-optional-unicodedata.patch
> diff --git a/package/python/python-110-optional-db.patch b/package/python/110-optional-db.patch
> similarity index 100%
> rename from package/python/python-110-optional-db.patch
> rename to package/python/110-optional-db.patch
> diff --git a/package/python/python-111-optional-ssl.patch b/package/python/111-optional-ssl.patch
> similarity index 100%
> rename from package/python/python-111-optional-ssl.patch
> rename to package/python/111-optional-ssl.patch
> diff --git a/package/python/python-112-optional-bzip2.patch b/package/python/112-optional-bzip2.patch
> similarity index 100%
> rename from package/python/python-112-optional-bzip2.patch
> rename to package/python/112-optional-bzip2.patch
> diff --git a/package/python/python-113-optional-zlib.patch b/package/python/113-optional-zlib.patch
> similarity index 100%
> rename from package/python/python-113-optional-zlib.patch
> rename to package/python/113-optional-zlib.patch
> diff --git a/package/python/python-114-remove-idle-editor.patch b/package/python/114-remove-idle-editor.patch
> similarity index 100%
> rename from package/python/python-114-remove-idle-editor.patch
> rename to package/python/114-remove-idle-editor.patch
> --
> 2.1.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/4] python3: bump to 3.4.2
2014-12-28 20:54 ` [Buildroot] [PATCH 1/4] python3: bump to 3.4.2 Thomas Petazzoni
@ 2015-01-02 18:23 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-01-02 18:23 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-12-28 21:54 +0100, Thomas Petazzoni spake thusly:
> This commit bumps python3 to Python 3.4.2. Two patches had to be
> changed slightly to fix some minor conflicts.
>
> PYTHON3_LIBTOOL_PATH = NO was added to prevent Buildroot from trying
> to patch a version of libtool for which we don't have matching
> patches, which isn't a problem since we're anyway not using the part
> of the Python sources that uses libtool (it's the built-in copy of
> libffi, and we use the external libffi).
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[run-time testedi on ARM to at least print("Hello World\n") properly]
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] python3: rename patches to the new convention
2014-12-28 20:54 ` [Buildroot] [PATCH 2/4] python3: rename patches to the new convention Thomas Petazzoni
@ 2015-01-02 18:24 ` Yann E. MORIN
0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2015-01-02 18:24 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-12-28 21:54 +0100, Thomas Petazzoni spake thusly:
> Now that we don't use completely sequential numbers, because patches
> below 100 are used to address cross-compilation issues in Python 3,
> while patches above 100 are used to make more Python 3 modules
> configurable.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-01-02 18:24 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-28 20:54 [Buildroot] [PATCH 0/4] Python and Python 3 version bumps Thomas Petazzoni
2014-12-28 20:54 ` [Buildroot] [PATCH 1/4] python3: bump to 3.4.2 Thomas Petazzoni
2015-01-02 18:23 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 2/4] python3: rename patches to the new convention Thomas Petazzoni
2015-01-02 18:24 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 3/4] python: bump to 2.7.9 Thomas Petazzoni
2015-01-02 18:15 ` Yann E. MORIN
2014-12-28 20:54 ` [Buildroot] [PATCH 4/4] python: rename patches to the new convention Thomas Petazzoni
2015-01-02 18:16 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.