From 82565d1e730fc3053544c8795e72ea6775707ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 11 Feb 2019 21:57:04 +0100 Subject: [PATCH] python-simplejson: add Python3 specific package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package is rewritten to be current type of python package with variants but for backward compatibility the simplejson package name was left as is and new Python3 specific package was named correctly as python3-simplejson. Signed-off-by: Karel Kočí --- lang/python/python-simplejson/Makefile | 64 ++++++++++++++++++++++++++ lang/python/simplejson/Makefile | 47 ------------------- 2 files changed, 64 insertions(+), 47 deletions(-) create mode 100644 lang/python/python-simplejson/Makefile delete mode 100644 lang/python/simplejson/Makefile diff --git a/lang/python/python-simplejson/Makefile b/lang/python/python-simplejson/Makefile new file mode 100644 index 000000000..3ba4a6764 --- /dev/null +++ b/lang/python/python-simplejson/Makefile @@ -0,0 +1,64 @@ +# +# Copyright (C) 2007-2017 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=python-simplejson +PKG_VERSION:=3.16.0 +PKG_RELEASE:=1 +PKG_LICENSE:=MIT + +PKG_SOURCE:=simplejson-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/s/simplejson +PKG_HASH:=b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-simplejson-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk +include ../python-package.mk +include ../python3-package.mk + +PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) + +define Package/python-simplejson/Default + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + MAINTAINER:=Alexandru Ardelean + URL:=https://simplejson.readthedocs.org/ +endef + +define Package/python-simplejson +$(call Package/python-simplejson/Default) + TITLE:=Simple, fast, extensible JSON encoder/decoder for Python 2 + DEPENDS:=+PACKAGE_python-simplejson:python-light + VARIANT:=python +endef + +define Package/python3-simplejson +$(call Package/python-simplejson/Default) + TITLE:=Simple, fast, extensible JSON encoder/decoder for Python3 + DEPENDS:=+PACKAGE_python3-simplejson:python3-light + VARIANT:=python3 +endef + +define Package/python-simplejson/description + Simple, fast, extensible JSON encoder/decoder for Python +endef + +define Package/python3-simplejson/description +$(call Package/python-simplejson/description) +. +(Variant for Python3) +endef + +$(eval $(call PyPackage,python-simplejson)) +$(eval $(call BuildPackage,python-simplejson)) +$(eval $(call BuildPackage,python-simplejson-src)) + +$(eval $(call Py3Package,python3-simplejson)) +$(eval $(call BuildPackage,python3-simplejson)) +$(eval $(call BuildPackage,python3-simplejson-src)) diff --git a/lang/python/simplejson/Makefile b/lang/python/simplejson/Makefile deleted file mode 100644 index 0f43a675c..000000000 --- a/lang/python/simplejson/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2007-2017 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=simplejson -PKG_VERSION:=3.16.0 -PKG_RELEASE:=1 -PKG_LICENSE:=MIT - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/s/simplejson -PKG_HASH:=b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5 - -include $(INCLUDE_DIR)/package.mk -include ../python-package.mk - -define Package/simplejson - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - MAINTAINER:=Gergely Kiss - TITLE:=Simple, fast, extensible JSON encoder/decoder for Python - URL:=https://simplejson.readthedocs.org/ - DEPENDS:=+python -endef - -define Package/simplejson/description - Simple, fast, extensible JSON encoder/decoder for Python -endef - -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) -endef - -define Package/simplejson/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,simplejson))