From 953e29f06735b5abb56be30142f5b050808df453 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Thu, 7 Jul 2022 17:35:41 +0800 Subject: [PATCH] python-cryptography: Fix failing build Fixes https://github.com/openwrt/packages/issues/18876. Fixes https://github.com/openwrt/packages/issues/18879. Signed-off-by: Jeffery To (cherry picked from commit 9e3b7d78837b7181b859472894aa243a2eae595b) --- lang/python/python-cryptography/Makefile | 2 +- .../python-cryptography/patches/0004-disable-rust.patch | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile index 7284f2a106..f9805d1b38 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:=3.4.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=cryptography PKG_HASH:=94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c diff --git a/lang/python/python-cryptography/patches/0004-disable-rust.patch b/lang/python/python-cryptography/patches/0004-disable-rust.patch index b005851cb6..81c45a44df 100644 --- a/lang/python/python-cryptography/patches/0004-disable-rust.patch +++ b/lang/python/python-cryptography/patches/0004-disable-rust.patch @@ -9,9 +9,12 @@ except ImportError: print( """ -@@ -45,7 +45,7 @@ setuptools_rust = "setuptools-rust>=0.11 +@@ -43,9 +43,9 @@ with open(os.path.join(src_dir, "cryptog + # `pyproject.toml` + setuptools_rust = "setuptools-rust>=0.11.4" install_requirements = ["cffi>=1.12"] - setup_requirements = install_requirements + [setuptools_rust] +-setup_requirements = install_requirements + [setuptools_rust] ++setup_requirements = install_requirements -if os.environ.get("CRYPTOGRAPHY_DONT_BUILD_RUST"): +if True: -- 2.30.2