LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

python-packages: Disable parallel build when host pip is needed 

This adds PKG_BUILD_PARALLEL:=0 to packages that depend on host Python
packages (HOST_PYTHON3_PACKAGE_BUILD_DEPENDS), because installing
packages with multiple concurrent pip processes can lead to errors or
unexpected results[1].

This also:

* Move HOST_PYTHON3_PACKAGE_BUILD_DEPENDS definitions to before
  python3-package.mk is included

* Update Python folder readme to include PKG_BUILD_PARALLEL:=0

[1]: https://github.com/pypa/pip/issues/2361

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
lilik-openwrt-22.03
Jeffery To 4 years ago
parent
811ff39de5
commit
e0e2224f8a
No known key found for this signature in database GPG Key ID: C616D9E719E868E4
12 changed files with 33 additions and 20 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -0
      lang/python/README.md
  2. +2
    -1
      lang/python/bcrypt/Makefile
  3. +3
    -2
      lang/python/numpy/Makefile
  4. +2
    -1
      lang/python/python-cryptography/Makefile
  5. +3
    -2
      lang/python/python-jsonschema/Makefile
  6. +4
    -3
      lang/python/python-pluggy/Makefile
  7. +4
    -3
      lang/python/python-py/Makefile
  8. +2
    -1
      lang/python/python-pycparser/Makefile
  9. +2
    -1
      lang/python/python-pynacl/Makefile
  10. +2
    -1
      lang/python/python-pytest/Makefile
  11. +4
    -3
      lang/python/python-zipp/Makefile
  12. +2
    -2
      net/seafile-seahub/Makefile

+ 3
- 0
lang/python/README.md View File

@ -332,8 +332,11 @@ These can be installed via pip and ideally they should only be installed like th
Which is why [for example] if you need python cffi on the host build, it's easier to just add it via: Which is why [for example] if you need python cffi on the host build, it's easier to just add it via:
``` ```
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi==$(PKG_VERSION)" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi==$(PKG_VERSION)"
``` ```
[cffi is one of those packages that needs a host-side package installed]. [cffi is one of those packages that needs a host-side package installed].
This works reasonably well in the current OpenWrt build system, as binaries get built for this package and get installed in the staging-dir `$(STAGING_DIR)/usr/lib/pythonX.Y/site-packages`. This works reasonably well in the current OpenWrt build system, as binaries get built for this package and get installed in the staging-dir `$(STAGING_DIR)/usr/lib/pythonX.Y/site-packages`.
`PKG_BUILD_PARALLEL:=0` is necessary because installing packages with multiple concurrent pip processes can lead to [errors or unexpected results](https://github.com/pypa/pip/issues/2361).

+ 2
- 1
lang/python/bcrypt/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bcrypt PKG_NAME:=bcrypt
PKG_VERSION:=3.1.7 PKG_VERSION:=3.1.7
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=$(PKG_NAME) PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42 PKG_HASH:=0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42
@ -16,6 +16,7 @@ PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=libffi/host PKG_BUILD_DEPENDS:=libffi/host
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.1" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.1"
include ../pypi.mk include ../pypi.mk


+ 3
- 2
lang/python/numpy/Makefile View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=numpy PKG_NAME:=numpy
PKG_VERSION:=1.18.5 PKG_VERSION:=1.18.5
PKG_RELEASE:=1
PKG_RELEASE:=2
PYPI_NAME:=$(PKG_NAME) PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b PKG_HASH:=34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b
@ -20,7 +20,8 @@ PKG_CPE_ID:=cpe:/a:numpy:numpy
# yes, zip... sigh # yes, zip... sigh
PYPI_SOURCE_EXT:=zip PYPI_SOURCE_EXT:=zip
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS="Cython==0.29.19"
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Cython==0.29.19"
include ../pypi.mk include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


+ 2
- 1
lang/python/python-cryptography/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-cryptography PKG_NAME:=python-cryptography
PKG_VERSION:=2.9.2 PKG_VERSION:=2.9.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PYPI_NAME:=cryptography PYPI_NAME:=cryptography
PKG_HASH:=a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229 PKG_HASH:=a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229
@ -19,6 +19,7 @@ PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleanalex@gmail.com> PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>, Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_BUILD_DEPENDS:=libffi/host PKG_BUILD_DEPENDS:=libffi/host
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3"


+ 3
- 2
lang/python/python-jsonschema/Makefile View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-jsonschema PKG_NAME:=python-jsonschema
PKG_VERSION:=3.2.0 PKG_VERSION:=3.2.0
PKG_RELEASE:=3
PKG_RELEASE:=4
PYPI_NAME:=jsonschema PYPI_NAME:=jsonschema
PKG_HASH:=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a PKG_HASH:=c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
@ -11,7 +11,8 @@ PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS=setuptools_scm
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools_scm
include ../pypi.mk include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


+ 4
- 3
lang/python/python-pluggy/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-pluggy PKG_NAME:=python-pluggy
PKG_VERSION:=0.13.1 PKG_VERSION:=0.13.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=pluggy PYPI_NAME:=pluggy
PKG_HASH:=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0 PKG_HASH:=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
@ -18,12 +18,13 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
include ../pypi.mk include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk include ../python3-package.mk
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
define Package/python3-pluggy define Package/python3-pluggy
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang


+ 4
- 3
lang/python/python-py/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-py PKG_NAME:=python-py
PKG_VERSION:=1.8.1 PKG_VERSION:=1.8.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=py PYPI_NAME:=py
PKG_HASH:=5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa PKG_HASH:=5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa
@ -18,12 +18,13 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
include ../pypi.mk include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk include ../python3-package.mk
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
define Package/python3-py define Package/python3-py
SUBMENU:=Python SUBMENU:=Python
SECTION:=lang SECTION:=lang


+ 2
- 1
lang/python/python-pycparser/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-pycparser PKG_NAME:=python-pycparser
PKG_VERSION:=2.20 PKG_VERSION:=2.20
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=pycparser PYPI_NAME:=pycparser
PKG_HASH:=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 PKG_HASH:=2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
@ -18,6 +18,7 @@ PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com> PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="ply==3.10" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="ply==3.10"
include ../pypi.mk include ../pypi.mk


+ 2
- 1
lang/python/python-pynacl/Makefile View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-pynacl PKG_NAME:=python-pynacl
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=PyNaCl PYPI_NAME:=PyNaCl
PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 PKG_HASH:=54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505
@ -12,6 +12,7 @@ PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DEPENDS:=libffi/host PKG_BUILD_DEPENDS:=libffi/host
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.4.1" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.4.1"


+ 2
- 1
lang/python/python-pytest/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-pytest PKG_NAME:=python-pytest
PKG_VERSION:=5.4.2 PKG_VERSION:=5.4.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PYPI_NAME:=pytest PYPI_NAME:=pytest
PKG_HASH:=eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698 PKG_HASH:=eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698
@ -18,6 +18,7 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm
include ../pypi.mk include ../pypi.mk


+ 4
- 3
lang/python/python-zipp/Makefile View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-zipp PKG_NAME:=python-zipp
PKG_VERSION:=3.1.0 PKG_VERSION:=3.1.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PYPI_NAME:=zipp PYPI_NAME:=zipp
PKG_HASH:=c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96 PKG_HASH:=c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96
@ -11,6 +11,9 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=MIT PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_PARALLEL:=0
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="setuptools_scm[toml] >= 3.4.1"
include ../pypi.mk include ../pypi.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk include ../python3-package.mk
@ -24,8 +27,6 @@ define Package/python3-zipp
DEPENDS:=+python3-light DEPENDS:=+python3-light
endef endef
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="setuptools_scm[toml] >= 3.4.1"
define Package/python3-zipp/description define Package/python3-zipp/description
Backport of pathlib-compatible object wrapper for zip files Backport of pathlib-compatible object wrapper for zip files
endef endef


+ 2
- 2
net/seafile-seahub/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=seafile-seahub PKG_NAME:=seafile-seahub
PKG_VERSION:=7.1.4 PKG_VERSION:=7.1.4
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server? PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seahub/tar.gz/v$(PKG_VERSION)-server?
@ -23,7 +23,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/seahub-$(PKG_VERSION)-server
HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Django~=1.11" HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="Django~=1.11"
PKG_BUILD_PARALLEL:=1
PKG_BUILD_PARALLEL:=0
PYTHON3_PKG_BUILD:=0 PYTHON3_PKG_BUILD:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


Write Preview
Loading…
Cancel
Save