Browse Source

treewide: Add PACKAGE_* conds to python packages

If a package builds python & python3 variants, then the respective
PACKAGE-python* conditional DEPENDS were added, since circular
dependencies should all be resolved now.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
lilik-openwrt-22.03
Eneas U de Queiroz 5 years ago
parent
commit
65009e8127
No known key found for this signature in database GPG Key ID: 1EB043ABD7ACF202
11 changed files with 52 additions and 47 deletions
  1. +16
    -16
      lang/python/python-awscli/Makefile
  2. +12
    -12
      lang/python/python-botocore/Makefile
  3. +2
    -2
      lang/python/python-colorama/Makefile
  4. +2
    -2
      lang/python/python-docutils/Makefile
  5. +2
    -2
      lang/python/python-jmespath/Makefile
  6. +1
    -1
      lang/python/python-ply/Makefile
  7. +2
    -2
      lang/python/python-pyserial/Makefile
  8. +5
    -5
      lang/python/python-requests/Makefile
  9. +2
    -2
      lang/python/python-rsa/Makefile
  10. +7
    -2
      lang/python/python-s3transfer/Makefile
  11. +1
    -1
      lang/python/python-simplejson/Makefile

+ 16
- 16
lang/python/python-awscli/Makefile View File

@ -28,27 +28,27 @@ endef
define Package/python-awscli
$(call Package/python-awscli/Default)
DEPENDS:=+python \
+python-yaml \
+python-pyasn1 \
+python-botocore \
+python-rsa \
+python-colorama \
+python-docutils \
+python-s3transfer
DEPENDS:=+PACKAGE_python-awscli:python \
+PACKAGE_python-awscli:python-yaml \
+PACKAGE_python-awscli:python-pyasn1 \
+PACKAGE_python-awscli:python-botocore \
+PACKAGE_python-awscli:python-rsa \
+PACKAGE_python-awscli:python-colorama \
+PACKAGE_python-awscli:python-docutils \
+PACKAGE_python-awscli:python-s3transfer
VARIANT:=python
endef
define Package/python3-awscli
$(call Package/python-awscli/Default)
DEPENDS:=+python3 \
+python3-yaml \
+python3-pyasn1 \
+python3-botocore \
+python3-rsa \
+python3-colorama \
+python3-docutils \
+python3-s3transfer
DEPENDS:=+PACKAGE_python3-awscli:python3 \
+PACKAGE_python3-awscli:python3-yaml \
+PACKAGE_python3-awscli:python3-pyasn1 \
+PACKAGE_python3-awscli:python3-botocore \
+PACKAGE_python3-awscli:python3-rsa \
+PACKAGE_python3-awscli:python3-colorama \
+PACKAGE_python3-awscli:python3-docutils \
+PACKAGE_python3-awscli:python3-s3transfer
VARIANT:=python3
endef


+ 12
- 12
lang/python/python-botocore/Makefile View File

@ -28,23 +28,23 @@ endef
define Package/python-botocore
$(call Package/python-botocore/Default)
DEPENDS:=+python \
+python-urllib3 \
+python-docutils \
+python-dateutil \
+python-jmespath \
+python-requests
DEPENDS:=+PACKAGE_python-botocore:python \
+PACKAGE_python-botocore:python-urllib3 \
+PACKAGE_python-botocore:python-docutils \
+PACKAGE_python-botocore:python-dateutil \
+PACKAGE_python-botocore:python-jmespath \
+PACKAGE_python-botocore:python-requests
VARIANT:=python
endef
define Package/python3-botocore
$(call Package/python-botocore/Default)
DEPENDS:=+python3 \
+python3-urllib3 \
+python3-docutils \
+python3-dateutil \
+python3-jmespath \
+python3-requests
DEPENDS:=+PACKAGE_python3-botocore:python3 \
+PACKAGE_python3-botocore:python3-urllib3 \
+PACKAGE_python3-botocore:python3-docutils \
+PACKAGE_python3-botocore:python3-dateutil \
+PACKAGE_python3-botocore:python3-jmespath \
+PACKAGE_python3-botocore:python3-requests
VARIANT:=python3
endef


+ 2
- 2
lang/python/python-colorama/Makefile View File

@ -28,13 +28,13 @@ endef
define Package/python-colorama
$(call Package/python-colorama/Default)
DEPENDS:=+python
DEPENDS:=+PACKAGE_python-colorama:python
VARIANT:=python
endef
define Package/python3-colorama
$(call Package/python-colorama/Default)
DEPENDS:=+python3
DEPENDS:=+PACKAGE_python3-colorama:python3
VARIANT:=python3
endef


+ 2
- 2
lang/python/python-docutils/Makefile View File

@ -28,13 +28,13 @@ endef
define Package/python-docutils
$(call Package/python-docutils/Default)
DEPENDS:=+python
DEPENDS:=+PACKAGE_python-docutils:python
VARIANT:=python
endef
define Package/python3-docutils
$(call Package/python-docutils/Default)
DEPENDS:=+python3
DEPENDS:=+PACKAGE_python3-docutils:python3
VARIANT:=python3
endef


+ 2
- 2
lang/python/python-jmespath/Makefile View File

@ -28,13 +28,13 @@ endef
define Package/python-jmespath
$(call Package/python-jmespath/Default)
DEPENDS:=+python
DEPENDS:=+PACKAGE_python-jmespath:python
VARIANT:=python
endef
define Package/python3-jmespath
$(call Package/python-jmespath/Default)
DEPENDS:=+python3
DEPENDS:=+PACKAGE_python3-jmespath:python3
VARIANT:=python3
endef


+ 1
- 1
lang/python/python-ply/Makefile View File

@ -44,7 +44,7 @@ endef
define Package/python3-ply
$(call Package/python-ply/Default)
DEPENDS:=+python3-light
DEPENDS:=+PACKAGE_python3-ply:python3-light
VARIANT:=python3
endef


+ 2
- 2
lang/python/python-pyserial/Makefile View File

@ -36,14 +36,14 @@ endef
define Package/python-pyserial
$(call Package/python-pyserial/Default)
TITLE:=python-pyserial
DEPENDS:=+python-light
DEPENDS:=+PACKAGE_python-pyserial:python-light
VARIANT:=python
endef
define Package/python3-pyserial
$(call Package/python-pyserial/Default)
TITLE:=python3-pyserial
DEPENDS:=+python3-light
DEPENDS:=+PACKAGE_python3-pyserial:python3-light
VARIANT:=python3
endef


+ 5
- 5
lang/python/python-requests/Makefile View File

@ -52,11 +52,11 @@ endef
define Package/python3-requests
$(call Package/python-requests/Default)
DEPENDS:= \
+python3-light \
+python3-chardet \
+python3-idna \
+python3-urllib3 \
+python3-certifi
+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
VARIANT:=python3
endef


+ 2
- 2
lang/python/python-rsa/Makefile View File

@ -28,13 +28,13 @@ endef
define Package/python-rsa
$(call Package/python-rsa/Default)
DEPENDS:=+python +python-pyasn1
DEPENDS:=+PACKAGE_python-rsa:python +PACKAGE_python-rsa:python-pyasn1
VARIANT:=python
endef
define Package/python3-rsa
$(call Package/python-rsa/Default)
DEPENDS:=+python3 +python3-pyasn1
DEPENDS:=+PACKAGE_python3-rsa:python3 +PACKAGE_python3-rsa:python3-pyasn1
VARIANT:=python3
endef


+ 7
- 2
lang/python/python-s3transfer/Makefile View File

@ -28,13 +28,18 @@ endef
define Package/python-s3transfer
$(call Package/python-s3transfer/Default)
DEPENDS:=+python +python-botocore +python-futures
DEPENDS:= \
+PACKAGE_python-s3transfer:python \
+PACKAGE_python-s3transfer:python-botocore \
+PACKAGE_python-s3transfer:python-futures
VARIANT:=python
endef
define Package/python3-s3transfer
$(call Package/python-s3transfer/Default)
DEPENDS:=+python3 +python3-botocore
DEPENDS:= \
+PACKAGE_python3-s3transfer:python3 \
+PACKAGE_python3-s3transfer:python3-botocore
VARIANT:=python3
endef


+ 1
- 1
lang/python/python-simplejson/Makefile View File

@ -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:=+python-light
DEPENDS:=+PACKAGE_python-simplejson:python-light
VARIANT:=python
endef


Loading…
Cancel
Save