diff --git a/lang/python/python-six/Makefile b/lang/python/python-six/Makefile index 24efe874e..a68792ab6 100644 --- a/lang/python/python-six/Makefile +++ b/lang/python/python-six/Makefile @@ -9,35 +9,47 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-six PKG_VERSION:=1.10.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=six-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://pypi.python.org/packages/source/s/six -PKG_MD5SUM:=34eed507548117b2ab523ab14b2f8b55 +PKG_HASH:=105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a HOST_BUILD_DEPENDS:=python/host -PKG_BUILD_DEPENDS:=python -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-six-$(PKG_VERSION) PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jeffery To +PKG_MAINTAINER:=Jeffery To , Alexandru Ardelean include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) +$(call include_mk, python3-package.mk) PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) HOST_UNPACK:=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) +define Package/python-six/Default + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + URL:=https://pypi.python.org/pypi/six +endef + define Package/python-six - SECTION:=lang - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=python-six - URL:=https://pypi.python.org/pypi/six - DEPENDS:=+python-light +$(call Package/python-six/Default) + TITLE:=python-six + DEPENDS:=+PACKAGE_python-six:python-light + VARIANT:=python +endef + +define Package/python3-six +$(call Package/python-six/Default) + TITLE:=python3-six + DEPENDS:=+PACKAGE_python3-six:python3-light + VARIANT:=python3 endef define Package/python-six/description @@ -47,8 +59,10 @@ writing Python code that is compatible on both Python versions. See the documentation for more information on what is provided. endef -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) +define Package/python3-six/description +$(call Package/python-six/description) +. +(Variant for Python3) endef define Host/Compile @@ -61,3 +75,5 @@ $(eval $(call HostBuild)) $(eval $(call PyPackage,python-six)) $(eval $(call BuildPackage,python-six)) +$(eval $(call Py3Package,python3-six)) +$(eval $(call BuildPackage,python3-six))