Commit 144e21f2 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

python3: bump to 3.4.2 



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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 8fb574fd

package/python3/python3-001-remove-host-header-path.patch

+1 −1
Original line number Diff line number Diff line
@@ -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' \

package/python3/python3-002-properly-detect-if-python-build.patch

+1 −1
Original line number Diff line number Diff line
@@ -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')):

package/python3/python3-003-sysconfigdata-install-location.patch

+8 −8
Original line number Diff line number Diff line
@@ -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)

package/python3/python3-004-old-stdlib-cache.patch

+3 −3
Original line number Diff line number Diff line
@@ -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 \

package/python3/python3-005-pyc-pyo-conditional.patch

+2 −2
Original line number Diff line number Diff line
@@ -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)