From c94c98efcaa0d85aa74c3db1b8ef08978f84699d Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 29 May 2019 23:08:19 +0800 Subject: [PATCH] python-cffi,python-cryptography: Fix build depends python-cryptography's build depends (host cffi, libffi) were transferred to python-cffi at some point; this corrects the situation. python-cryptography's host Python build depends is copied from its setup.py[1]. [1]: https://github.com/pyca/cryptography/blob/2.6.1/setup.py#L47 Signed-off-by: Jeffery To --- lang/python/python-cffi/Makefile | 5 ----- lang/python/python-cryptography/Makefile | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lang/python/python-cffi/Makefile b/lang/python/python-cffi/Makefile index b450d17aad..c22e8196b7 100644 --- a/lang/python/python-cffi/Makefile +++ b/lang/python/python-cffi/Makefile @@ -21,11 +21,6 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To , Alexandru Ardelean -PKG_BUILD_DEPENDS:=libffi/host - -HOST_PYTHON_PACKAGE_BUILD_DEPENDS:="cffi==$(PKG_VERSION)" -HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi==$(PKG_VERSION)" - include $(INCLUDE_DIR)/package.mk include ../python-package.mk include ../python3-package.mk diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile index 0fe610afea..0d21363d16 100644 --- a/lang/python/python-cryptography/Makefile +++ b/lang/python/python-cryptography/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cryptography PKG_VERSION:=2.6.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/c/cryptography @@ -20,6 +20,10 @@ PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD PKG_MAINTAINER:=Jeffery To , Alexandru Ardelean PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-cryptography-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=libffi/host + +HOST_PYTHON_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3" +HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:="cffi>=1.8,!=1.11.3" include $(INCLUDE_DIR)/package.mk include ../python-package.mk -- 2.30.2