Commit 6afba01e authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

python3: bump to version 3.4.3 

All patches are simply refreshed, except
002-properly-detect-if-python-build.patch which is removed because an
identical fix has been merged upstream:

  https://github.com/python/cpython/commit/e128ea78e5964929ca902bebc07c242d58609dfc



Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent af616e4f

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

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
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

@@ -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')):

-            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:

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

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Index: b/Makefile.pre.in 
===================================================================

--- a/Makefile.pre.in

+++ b/Makefile.pre.in

@@ -558,6 +558,9 @@

@@ -559,6 +559,9 @@

 		rm -f ./pybuilddir.txt ; \

 		exit 1 ; \

 	fi
@@ -31,7 +31,7 @@ Index: b/Makefile.pre.in 
 

 # Build the shared modules

 # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for

@@ -1196,7 +1199,7 @@

@@ -1197,7 +1200,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); \

@@ -1206,6 +1209,11 @@

@@ -1207,6 +1210,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; \

@@ -1529,7 +1537,7 @@

@@ -1533,7 +1541,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

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Index: b/Makefile.pre.in 
 # Environment to run shared python without installed libraries

 RUNSHARED=       @RUNSHARED@

 

@@ -1246,21 +1249,21 @@

@@ -1247,21 +1250,21 @@

 	fi

 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \

 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \

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

+1 −1
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

@@ -1247,24 +1247,32 @@

@@ -1248,24 +1248,32 @@

 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \

 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \

 	fi

package/python3/006-cross-compile-getaddrinfo.patch

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -3429,7 +3429,7 @@

@@ -3432,7 +3432,7 @@

 

 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)