python3: version bump 3.1.4 -> 3.4.2

Update python3 to version 3.4.2

This is all work done by:
  Han Sirkstra <han@protonic.nl>
  Robin van der Gracht <robin@protonic.nl>

Signed-off-by: David Jander <david@protonic.nl>
[copy to ptxdist mainline, remove old patches]
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>

1 files changed, 22 insertions, 50 deletions

diff --git a/rules/python3.make b/rules/python3.make
index 10eb9b47a..f497cac1c 100644
--- a/rules/python3.make
+++ b/rules/python3.make
@@ -17,12 +17,12 @@ PACKAGES-$(PTXCONF_PYTHON3) += python3
 #
 # Paths and names
 #
-PYTHON3_VERSION		:= 3.1.4
-PYTHON3_MD5		:= 09ed98eace4c403b475846702708675e
+PYTHON3_VERSION		:= 3.4.2
+PYTHON3_MD5		:= 5566bc7e1fdf6bed45f9a750d5f80fc2
 PYTHON3_MAJORMINOR	:= $(basename $(PYTHON3_VERSION))
 PYTHON3_SITEPACKAGES	:= /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages
 PYTHON3			:= Python-$(PYTHON3_VERSION)
-PYTHON3_SUFFIX		:= tar.bz2
+PYTHON3_SUFFIX		:= tgz
 PYTHON3_SOURCE		:= $(SRCDIR)/$(PYTHON3).$(PYTHON3_SUFFIX)
 PYTHON3_DIR		:= $(BUILDDIR)/$(PYTHON3)
 
@@ -30,23 +30,24 @@ PYTHON3_URL		:= \
 	http://python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \
 	http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX)
 
-CROSS_PYTHON3		:= $(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-PYTHON3_PATH	:= PATH=$(CROSS_PATH)
+PYTHON3_PATH	:= PATH=$(HOST_PATH)
 PYTHON3_ENV 	:= \
 	$(CROSS_ENV) \
-	PYTHON_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) \
 	ac_sys_system=Linux \
 	ac_sys_release=2 \
 	MACHDEP=linux2 \
 	ac_cv_have_chflags=no \
 	ac_cv_have_lchflags=no \
 	ac_cv_py_format_size_t=yes \
-	ac_cv_broken_sem_getvalue=no
+	ac_cv_broken_sem_getvalue=no \
+	ac_cv_file__dev_ptmx=no \
+	ac_cv_file__dev_ptc=no \
+	LDFLAGS="-L $(PTXDIST_SYSROOT_TARGET)/lib/ \
+		 -L $(PTXDIST_SYSROOT_TARGET)/usr/lib/"
 
 PYTHON3_BINCONFIG_GLOB := ""
 
@@ -60,8 +61,8 @@ PYTHON3_AUTOCONF := \
 	--with-pymalloc \
 	--with-signal-module \
 	--with-threads \
-	--with-wctype-functions \
-	--without-doc-strings
+	--without-doc-strings \
+	--without-ensurepip
 
 PYTHON3_MAKEVARS := \
 	PGEN_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/pgen
@@ -72,55 +73,25 @@ PYTHON3_MAKEVARS := \
 
 $(STATEDIR)/python3.install:
 	@$(call targetinfo)
+
+	# Remove unimportant libfiles that produce errors when compiled
+	@rm -vrf $(BUILDDIR)/Python-$(PYTHON3_VERSION)/Lib/lib2to3
+	@rm -vrf $(BUILDDIR)/Python-$(PYTHON3_VERSION)/Lib/test
+
 	@$(call install, PYTHON3)
-	@cp "$(PYTHON3_DIR)/cross-python-wrapper" "$(PYTHON3_PKGDIR)/usr/bin/"
-	@sed -i \
-		-e "s:$(SYSROOT):@SYSROOT@:g" \
-		-e "s:$(PTXCONF_SYSROOT_HOST):@SYSROOT_HOST@:g" \
-		$(PYTHON3_PKGDIR)/usr/lib/python$(PYTHON3_MAJORMINOR)/config/Makefile
 	@$(call touch)
 
-
 $(STATEDIR)/python3.install.post:
 	@$(call targetinfo)
-	@sed -i \
-		-e "s:@SYSROOT@:$(SYSROOT):g" \
-		-e "s:@SYSROOT_HOST@:$(PTXCONF_SYSROOT_HOST):g" \
-		$(PYTHON3_PKGDIR)/usr/lib/python$(PYTHON3_MAJORMINOR)/config/Makefile
 	@$(call world/install.post, PYTHON3)
-	@rm -f "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo '#!/bin/sh'				>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo ''					>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo 'prefix="/usr"'				>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo 'exec_prefix="$${prefix}"'		>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo ''					>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo 'CROSS_COMPILING=yes'			>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo '_python_sysroot="$(SYSROOT)"'		>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo '_python_prefix="$${prefix}"'		>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo '_python_exec_prefix="$${exec_prefix}"'	>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo ''					>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo 'export CROSS_COMPILING _python_sysroot _python_prefix _python_exec_prefix' \
-							>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo ''					>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-	@echo 'exec $(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) "$${@}"' \
-							>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
-
-#	@cp "$(PYTHON3_PKGDIR)/usr/bin/cross-python-wrapper" "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
+
+	@cp "$(PYTHON3_DIR)/cross-python-wrapper" "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
 	@chmod a+x "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)"
 	@ln -sf "python$(PYTHON3_MAJORMINOR)" \
 		"$(PTXCONF_SYSROOT_CROSS)/bin/python3"
 
-	@echo "#!/bin/sh" \
-		> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config"
-	@echo "exec \
-		\"$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)\" \
-		\"$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR)-config\" \
-		\"\$${@}\"" \
-		>> "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config"
-	@chmod a+x "$(PTXCONF_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)-config"
-	@ln -sf "python$(PYTHON3_MAJORMINOR)-config" \
-		"$(PTXCONF_SYSROOT_CROSS)/bin/python3-config"
-
+	# Byte compile all libraries
+	@$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) -m compileall -b -q $(PYTHON3_PKGDIR)/usr/lib/python$(PYTHON3_MAJORMINOR)
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
@@ -146,6 +117,7 @@ $(STATEDIR)/python3.targetinstall:
 	@$(call install_fixup, python3,PRIORITY,optional)
 	@$(call install_fixup, python3,SECTION,base)
 	@$(call install_fixup, python3,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
+	@$(call install_fixup, python3,AUTHOR,"Han Sierkstra <han@protonic.nl>")
 	@$(call install_fixup, python3,DESCRIPTION,missing)
 
 	@cd $(PYTHON3_PKGDIR) && \
@@ -158,7 +130,7 @@ $(STATEDIR)/python3.targetinstall:
 	done
 
 	@$(call install_copy, python3, 0, 0, 755, -, /usr/bin/python$(PYTHON3_MAJORMINOR))
-	@$(call install_lib, python3, 0, 0, 644, libpython$(PYTHON3_MAJORMINOR))
+	@$(call install_lib, python3, 0, 0, 644, libpython$(PYTHON3_MAJORMINOR)m)
 
 ifdef PTXCONF_PYTHON3_SYMLINK
 	@$(call install_link, python3, python$(PYTHON3_MAJORMINOR), /usr/bin/python3)