From 57d94bbd44ceba023af46d88261fc79bea88180a Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 14 Apr 2016 11:41:48 +0300 Subject: [PATCH] python3: upgrade to version 3.5.1 Signed-off-by: Alexandru Ardelean --- lang/python3/Makefile | 17 +++++++++-------- lang/python3/files/python3-package-asyncio.mk | 2 +- lang/python3/files/python3-package-codecs.mk | 2 +- lang/python3/files/python3-package-ctypes.mk | 2 +- lang/python3/files/python3-package-dbm.mk | 2 +- lang/python3/files/python3-package-decimal.mk | 2 +- lang/python3/files/python3-package-dev.mk | 2 +- lang/python3/files/python3-package-distutils.mk | 2 +- lang/python3/files/python3-package-email.mk | 2 +- lang/python3/files/python3-package-gdbm.mk | 2 +- lang/python3/files/python3-package-lib2to3.mk | 2 +- lang/python3/files/python3-package-logging.mk | 2 +- lang/python3/files/python3-package-lzma.mk | 2 +- .../files/python3-package-multiprocessing.mk | 2 +- lang/python3/files/python3-package-ncurses.mk | 2 +- lang/python3/files/python3-package-openssl.mk | 2 +- lang/python3/files/python3-package-pydoc.mk | 2 +- lang/python3/files/python3-package-sqlite3.mk | 2 +- lang/python3/files/python3-package-unittest.mk | 2 +- lang/python3/files/python3-package-xml.mk | 2 +- lang/python3/files/python3-package.mk | 8 ++++---- 21 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lang/python3/Makefile b/lang/python3/Makefile index cdaa93a09..06d37c389 100644 --- a/lang/python3/Makefile +++ b/lang/python3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -14,12 +14,12 @@ PYTHON_VERSION:=$(PYTHON3_VERSION) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PKG_NAME:=python3 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) -PKG_MD5SUM:=d149d2812f10cbe04c042232e7964171 +PKG_MD5SUM:=e9ea6f2623fffcdd871b7b19113fde80 PKG_LICENSE:=PSF PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE @@ -32,6 +32,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/Python-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/Python-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libbz2/host expat/host python3/host +HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk @@ -216,8 +217,8 @@ HOST_CONFIGURE_ARGS+= \ --without-cxx-main \ --without-pymalloc \ --with-threads \ - --prefix=$(STAGING_DIR)/host \ - --with-system-expat=$(STAGING_DIR)/host \ + --prefix=$(STAGING_DIR_HOST) \ + --with-system-expat=$(STAGING_DIR_HOST) \ --with-ensurepip=upgrade \ CONFIG_SITE= \ CFLAGS="$(HOST_CFLAGS)" @@ -228,10 +229,10 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin/ + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(MAKE) -C $(HOST_BUILD_DIR) install - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3 - $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen3 + $(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR_HOST)/bin/_freeze_importlib endef $(eval $(call HostBuild)) diff --git a/lang/python3/files/python3-package-asyncio.mk b/lang/python3/files/python3-package-asyncio.mk index 1d2faab3f..52eccae92 100644 --- a/lang/python3/files/python3-package-asyncio.mk +++ b/lang/python3/files/python3-package-asyncio.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-codecs.mk b/lang/python3/files/python3-package-codecs.mk index 66101e1fb..f768b02ea 100644 --- a/lang/python3/files/python3-package-codecs.mk +++ b/lang/python3/files/python3-package-codecs.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-ctypes.mk b/lang/python3/files/python3-package-ctypes.mk index 97c2c768a..f38e0118c 100644 --- a/lang/python3/files/python3-package-ctypes.mk +++ b/lang/python3/files/python3-package-ctypes.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-dbm.mk b/lang/python3/files/python3-package-dbm.mk index ed343d81a..409940229 100644 --- a/lang/python3/files/python3-package-dbm.mk +++ b/lang/python3/files/python3-package-dbm.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-decimal.mk b/lang/python3/files/python3-package-decimal.mk index 81ecbb0d4..391b6f659 100644 --- a/lang/python3/files/python3-package-decimal.mk +++ b/lang/python3/files/python3-package-decimal.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-dev.mk b/lang/python3/files/python3-package-dev.mk index 37ee05fda..7c2fc0d4b 100644 --- a/lang/python3/files/python3-package-dev.mk +++ b/lang/python3/files/python3-package-dev.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-distutils.mk b/lang/python3/files/python3-package-distutils.mk index 65f4b5aa6..b1f1fb5c6 100644 --- a/lang/python3/files/python3-package-distutils.mk +++ b/lang/python3/files/python3-package-distutils.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-email.mk b/lang/python3/files/python3-package-email.mk index dae351979..6cf44071d 100644 --- a/lang/python3/files/python3-package-email.mk +++ b/lang/python3/files/python3-package-email.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-gdbm.mk b/lang/python3/files/python3-package-gdbm.mk index cc929132c..7f98badf3 100644 --- a/lang/python3/files/python3-package-gdbm.mk +++ b/lang/python3/files/python3-package-gdbm.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-lib2to3.mk b/lang/python3/files/python3-package-lib2to3.mk index 4426a42a3..801fd915a 100644 --- a/lang/python3/files/python3-package-lib2to3.mk +++ b/lang/python3/files/python3-package-lib2to3.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-logging.mk b/lang/python3/files/python3-package-logging.mk index 4cd6ea979..fa3ec0e17 100644 --- a/lang/python3/files/python3-package-logging.mk +++ b/lang/python3/files/python3-package-logging.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-lzma.mk b/lang/python3/files/python3-package-lzma.mk index b04f072f9..57b38eced 100644 --- a/lang/python3/files/python3-package-lzma.mk +++ b/lang/python3/files/python3-package-lzma.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-multiprocessing.mk b/lang/python3/files/python3-package-multiprocessing.mk index 784aabb8b..c7976016d 100644 --- a/lang/python3/files/python3-package-multiprocessing.mk +++ b/lang/python3/files/python3-package-multiprocessing.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-ncurses.mk b/lang/python3/files/python3-package-ncurses.mk index 7e703b3dd..45649ac75 100644 --- a/lang/python3/files/python3-package-ncurses.mk +++ b/lang/python3/files/python3-package-ncurses.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-openssl.mk b/lang/python3/files/python3-package-openssl.mk index 255d58099..6971993f7 100644 --- a/lang/python3/files/python3-package-openssl.mk +++ b/lang/python3/files/python3-package-openssl.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-pydoc.mk b/lang/python3/files/python3-package-pydoc.mk index 7ed8c2110..9ab1a5b8b 100644 --- a/lang/python3/files/python3-package-pydoc.mk +++ b/lang/python3/files/python3-package-pydoc.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-sqlite3.mk b/lang/python3/files/python3-package-sqlite3.mk index 4b097a36b..665bff26a 100644 --- a/lang/python3/files/python3-package-sqlite3.mk +++ b/lang/python3/files/python3-package-sqlite3.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-unittest.mk b/lang/python3/files/python3-package-unittest.mk index 6d3643a71..d9df86f71 100644 --- a/lang/python3/files/python3-package-unittest.mk +++ b/lang/python3/files/python3-package-unittest.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package-xml.mk b/lang/python3/files/python3-package-xml.mk index e734f0c72..4893fa93c 100644 --- a/lang/python3/files/python3-package-xml.mk +++ b/lang/python3/files/python3-package-xml.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/lang/python3/files/python3-package.mk b/lang/python3/files/python3-package.mk index 4ffb18175..d1fbd038f 100644 --- a/lang/python3/files/python3-package.mk +++ b/lang/python3/files/python3-package.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2015 OpenWrt.org +# Copyright (C) 2007-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ PYTHON3_VERSION_MAJOR:=3 PYTHON3_VERSION_MINOR:=5 -PYTHON3_VERSION_MICRO:=0 +PYTHON3_VERSION_MICRO:=1 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) @@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages PYTHON3:=python$(PYTHON3_VERSION) -HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION) -HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3 +HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION) +HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3 PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) define HostPython3