Browse Source

python: upgrade to version 2.7.11

And split python-dev and python-lib2to3 packages.
Seems for python3 this was done, so we'll sync here.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
lilik-openwrt-22.03
Alexandru Ardelean 9 years ago
parent
commit
a8602a7ccb
4 changed files with 55 additions and 8 deletions
  1. +9
    -7
      lang/python/Makefile
  2. +27
    -0
      lang/python/files/python-package-dev.mk
  3. +18
    -0
      lang/python/files/python-package-lib2to3.mk
  4. +1
    -1
      lang/python/files/python-package.mk

+ 9
- 7
lang/python/Makefile View File

@ -12,11 +12,11 @@ include ./files/python-package.mk
PKG_NAME:=python PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_RELEASE:=6
PKG_RELEASE:=1
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)
PKG_MD5SUM:=c685ef0b8e9f27b5e3db5db12b268ac6
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_MD5SUM:=1dbcc848b4cd8399a8199d000f9f823c
PKG_LICENSE:=PSF 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 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
@ -39,7 +39,7 @@ define Package/python/Default
SECTION:=lang SECTION:=lang
CATEGORY:=Languages CATEGORY:=Languages
TITLE:=Python $(PYTHON_VERSION) programming language TITLE:=Python $(PYTHON_VERSION) programming language
URL:=http://www.python.org/
URL:=https://www.python.org/
MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
endef endef
@ -77,8 +77,12 @@ endef
PYTHON_LIB_FILES_DEL:= PYTHON_LIB_FILES_DEL:=
PYTHON_PACKAGES:= PYTHON_PACKAGES:=
PYTHON_PACKAGES_DEPENDS:=
define PyBasePackage define PyBasePackage
PYTHON_PACKAGES+=$(1) PYTHON_PACKAGES+=$(1)
ifeq ($(3),)
PYTHON_PACKAGES_DEPENDS+=$(1)
endif
PYTHON_LIB_FILES_DEL+=$(2) PYTHON_LIB_FILES_DEL+=$(2)
define PyPackage/$(1)/filespec define PyPackage/$(1)/filespec
$(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file))) $(subst $(space),$(newline),$(foreach lib_file,$(2),+|$(lib_file)))
@ -89,7 +93,7 @@ include ./files/python-package-*.mk
define Package/python define Package/python
$(call Package/python/Default) $(call Package/python/Default)
DEPENDS:=+python-light $(foreach package,$(PYTHON_PACKAGES),+$(package))
DEPENDS:=+python-light $(foreach package,$(PYTHON_PACKAGES_DEPENDS),+$(package))
endef endef
define Package/python/description define Package/python/description
@ -184,12 +188,10 @@ endef
define PyPackage/python-light/filespec define PyPackage/python-light/filespec
+|/usr/lib/python$(PYTHON_VERSION) +|/usr/lib/python$(PYTHON_VERSION)
-|/usr/lib/python$(PYTHON_VERSION)/config
-|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py -|/usr/lib/python$(PYTHON_VERSION)/distutils/cygwinccompiler.py
-|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst* -|/usr/lib/python$(PYTHON_VERSION)/distutils/command/wininst*
-|/usr/lib/python$(PYTHON_VERSION)/ensurepip -|/usr/lib/python$(PYTHON_VERSION)/ensurepip
-|/usr/lib/python$(PYTHON_VERSION)/idlelib -|/usr/lib/python$(PYTHON_VERSION)/idlelib
-|/usr/lib/python$(PYTHON_VERSION)/lib2to3
-|/usr/lib/python$(PYTHON_VERSION)/lib-tk -|/usr/lib/python$(PYTHON_VERSION)/lib-tk
-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_testcapi.so
-|/usr/lib/python$(PYTHON_VERSION)/pdb.doc -|/usr/lib/python$(PYTHON_VERSION)/pdb.doc


+ 27
- 0
lang/python/files/python-package-dev.mk View File

@ -0,0 +1,27 @@
#
# Copyright (C) 2006-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Package/python-dev
$(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) development files
DEPENDS:=+python
endef
define PyPackage/python-dev/install
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/python*config $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib
endef
$(eval $(call PyBasePackage,python-dev, \
/usr/lib/python$(PYTHON_VERSION)/config \
/usr/include/python$(PYTHON_VERSION) \
/usr/lib/pkgconfig \
, \
DO_NOT_ADD_TO_PACKAGE_DEPENDS \
))

+ 18
- 0
lang/python/files/python-package-lib2to3.mk View File

@ -0,0 +1,18 @@
#
# Copyright (C) 2006-2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
define Package/python-lib2to3
$(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) lib2to3 module
DEPENDS:=+python
endef
$(eval $(call PyBasePackage,python-lib2to3, \
/usr/lib/python$(PYTHON_VERSION)/lib2to3 \
, \
DO_NOT_ADD_TO_PACKAGE_DEPENDS \
))

+ 1
- 1
lang/python/files/python-package.mk View File

@ -6,7 +6,7 @@
# #
PYTHON_VERSION:=2.7 PYTHON_VERSION:=2.7
PYTHON_VERSION_MICRO:=10
PYTHON_VERSION_MICRO:=11
PYTHON_DIR:=$(STAGING_DIR)/usr PYTHON_DIR:=$(STAGING_DIR)/usr
PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin


Loading…
Cancel
Save