From 77988010809ad90c00bc767d0da36698adfc4054 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 24 Sep 2021 23:16:49 -0400 Subject: [PATCH] python3-cryptography: rebuild for Python 3.10, disable rust The rust extension is a no-op and currently fails to cross build with Python 3.10. For now, skip building the extension and hope upstream makes this easy to fix by the time the rust extension becomes mandatory. --- srcpkgs/python3-cryptography/template | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index dafe1e84c0e..495f4a69c95 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -1,11 +1,10 @@ # Template file for 'python3-cryptography' pkgname=python3-cryptography version=3.4.8 -revision=1 +revision=2 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module -build_helper="rust" -hostmakedepends="python3-setuptools-rust python3-cffi cargo" +hostmakedepends="python3-setuptools-rust python3-cffi" makedepends="python3-devel openssl-devel" depends="python3-cffi" checkdepends="python3-pytest-subtests python3-pytz python3-iso8601 @@ -18,11 +17,14 @@ changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG. distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" checksum=94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c -if [ "$CROSS_BUILD" ]; then - makedepends+=" rust-std" - export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" - export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" -fi +# The rust extension is a no-op designed to test build systems and, +# for the moment, does not work properly with Python 3.10 on cross. +# Hoepfully upstream tooling will make accommodating Python 3.10 trivial by the +# time the rust extension actually does something. +# +# See, e.g., commit 58bc3876d33bfa5e37a21b5a4b27f016af387a76 to see how the +# rust extension was built with Python 3.9. +export CRYPTOGRAPHY_DONT_BUILD_RUST=1 post_install() { vlicense LICENSE