From 5590cda91bfdb41da758e8b0144cff8b77f0f241 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Mar 2019 12:05:28 -0300 Subject: [PATCH 1/5] python-simplejson: fix circular dependency Removing python2 conditional DEPENDS to avoid a circular dependency. Signed-off-by: Eneas U de Queiroz --- lang/python/python-simplejson/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/python-simplejson/Makefile b/lang/python/python-simplejson/Makefile index 3ba4a6764..11a66a117 100644 --- a/lang/python/python-simplejson/Makefile +++ b/lang/python/python-simplejson/Makefile @@ -34,7 +34,7 @@ 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 + DEPENDS:=+python-light VARIANT:=python endef From 1bf60e9b58199a22028ee4670459ca0cbe252d32 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Mar 2019 13:46:08 -0300 Subject: [PATCH 2/5] python-ply: fix circular dependency Removing python3 conditional DEPENDS to avoid a circular dependency. Signed-off-by: Eneas U de Queiroz --- lang/python/python-ply/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/python-ply/Makefile b/lang/python/python-ply/Makefile index a728e15c8..aacaf15d5 100644 --- a/lang/python/python-ply/Makefile +++ b/lang/python/python-ply/Makefile @@ -44,7 +44,7 @@ endef define Package/python3-ply $(call Package/python-ply/Default) - DEPENDS:=+PACKAGE_python3-ply:python3-light + DEPENDS:=+python3-light VARIANT:=python3 endef From d8de24183fcc049aac3af0c57c2dc23a2f39ba57 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Mar 2019 13:59:45 -0300 Subject: [PATCH 3/5] python-requests: fix circular dependency Removing python3 conditional DEPENDS to avoid a circular dependency. Fixes a typo in Makefile. Signed-off-by: Eneas U de Queiroz --- lang/python/python-requests/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index 6884a0f3a..36b7302d6 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -25,11 +25,11 @@ include ../python3-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) -define Package/python-requests/Defaults +define Package/python-requests/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages - PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean + MAINTAINER:=Josef Schlehofer , Alexandru Ardelean URL:=http://python-requests.org/ endef @@ -49,11 +49,11 @@ define Package/python3-requests $(call Package/python-requests/Default) TITLE:=HTTP library for Python3 DEPENDS:= \ - +PACKAGE_python3-requests:python3-light \ - +PACKAGE_python3-requests:python3-chardet \ - +PACKAGE_python3-requests:python3-idna \ - +PACKAGE_python3-requests:python3-urllib3 \ - +PACKAGE_python3-requests:python3-certifi + +python3-light \ + +python3-chardet \ + +python3-idna \ + +python3-urllib3 \ + +python3-certifi VARIANT:=python3 endef From 8061b28ea02d49efe8ee6e1736b77ea9ce3009d2 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Mar 2019 14:21:54 -0300 Subject: [PATCH 4/5] python-chardet: fix Makefile typo Signed-off-by: Eneas U de Queiroz --- lang/python/python-chardet/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/python-chardet/Makefile b/lang/python/python-chardet/Makefile index 24d164ada..bce37b3c2 100644 --- a/lang/python/python-chardet/Makefile +++ b/lang/python/python-chardet/Makefile @@ -23,7 +23,7 @@ include ../python3-package.mk PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE) -define Package/python-chardet/Defaults +define Package/python-chardet/Default SUBMENU:=Python SECTION:=lang CATEGORY:=Languages From 9429b83840fbcf03298abed0e98e3eb0686796c7 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 13 Mar 2019 14:09:35 -0300 Subject: [PATCH 5/5] click-log: fix circular dependency Removing python3 conditional DEPENDS to avoid a circular dependency. Signed-off-by: Eneas U de Queiroz --- lang/python/click-log/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/python/click-log/Makefile b/lang/python/click-log/Makefile index 652bdc56a..3da043a5d 100644 --- a/lang/python/click-log/Makefile +++ b/lang/python/click-log/Makefile @@ -23,7 +23,7 @@ define Package/python3-click-log SUBMENU:=Python URL:=http://github.com/mitsuhiko/click TITLE:=python3-click-log - DEPENDS:=+PACKAGE_python3-click-log:python3-click + DEPENDS:=+python3-click VARIANT:=python3 endef