From c11a2ce804f70dcfb7f37db9c01685aae1f70348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:56:15 -0300 Subject: [PATCH 1/4] python3-adblock: inherit PYO3_CROSS variables from rust helper --- srcpkgs/python3-adblock/template | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template index 52736e7cbf819..de50cfe87bdc1 100644 --- a/srcpkgs/python3-adblock/template +++ b/srcpkgs/python3-adblock/template @@ -6,7 +6,7 @@ build_style=python3-pep517 build_helper="rust" #XXX: Does statically link against openssl hostmakedepends="maturin pkg-config cargo openssl-devel" -makedepends="openssl-devel python3-devel" +makedepends="openssl-devel python3-devel rust-std" depends="python3" checkdepends="python3-pytest python3-toml" short_desc="Brave's adblock library in Python" @@ -17,12 +17,6 @@ changelog="https://raw.githubusercontent.com/ArniDagur/python-adblock/master/CHA distfiles="${PYPI_SITE}/a/adblock/adblock-${version}.tar.gz" checksum=11651e956c69b3ee571404754df665854717255b80f437e9dc323ee82b564e72 -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 - do_build() { maturin build -o . --release --target "${RUST_TARGET}" --manylinux off From 0c89dced5336feb958966f7e0acb6fe445951477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:56:23 -0300 Subject: [PATCH 2/4] python3-bcrypt: inherit PYO3_CROSS variables from rust helper --- srcpkgs/python3-bcrypt/template | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/srcpkgs/python3-bcrypt/template b/srcpkgs/python3-bcrypt/template index f70c39db3e288..90e727aeac53f 100644 --- a/srcpkgs/python3-bcrypt/template +++ b/srcpkgs/python3-bcrypt/template @@ -5,7 +5,7 @@ revision=1 build_style=python3-pep517 build_helper="rust" hostmakedepends="python3-setuptools-rust python3-wheel python3-cffi cargo" -makedepends="python3-devel" +makedepends="python3-devel rust-std" depends="python3-cffi" checkdepends="python3-pytest $depends" short_desc="Modern password hashing for software and servers" @@ -15,9 +15,3 @@ homepage="https://github.com/pyca/bcrypt" changelog="https://github.com/pyca/bcrypt/blob/main/README.rst#changelog" distfiles="${PYPI_SITE}/b/bcrypt/bcrypt-${version}.tar.gz" checksum=27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd - -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 From 0b48c2288cf5a9d1421b41020e47d4e3427c1640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:56:34 -0300 Subject: [PATCH 3/4] python3-cryptography: inherit PYO3_CROSS variables from rust helper --- srcpkgs/python3-cryptography/template | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index b183104aa66e8..672c194423c3f 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -6,7 +6,7 @@ build_style=python3-module build_helper="rust" make_check_args="--ignore tests/bench/test_x509.py --ignore tests/bench/test_aead.py" hostmakedepends="python3-setuptools-rust python3-cffi cargo pkg-config" -makedepends="python3-devel openssl-devel" +makedepends="python3-devel rust-std openssl-devel" depends="python3-cffi" checkdepends="python3-pytest-subtests python3-pytest-xdist python3-iso8601 python3-pytz python3-cryptography_vectors @@ -19,12 +19,6 @@ changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG. distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" checksum=6d192741113ef5e30d89dcb5b956ef4e1578f304708701b8b73d38e3e1461f34 -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 - pre_check() { vsed -i '/addopts/d' pyproject.toml } From 493f69587f6362efaa7eea822e159a9be974327a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sat, 16 Sep 2023 11:56:49 -0300 Subject: [PATCH 4/4] python3-mitmproxy_wireguard: inherit PYO3_CROSS variables from rust helper --- srcpkgs/python3-mitmproxy_wireguard/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/python3-mitmproxy_wireguard/template b/srcpkgs/python3-mitmproxy_wireguard/template index bfa34a389a294..13c515928839a 100644 --- a/srcpkgs/python3-mitmproxy_wireguard/template +++ b/srcpkgs/python3-mitmproxy_wireguard/template @@ -16,10 +16,6 @@ distfiles="https://github.com/decathorpe/mitmproxy_wireguard/archive/${version}. checksum=749b5b45222b629f4cced154cc4bf70ba7ae3061db02e2ea0ae45a4ae6246463 do_build() { - if [ "$CROSS_BUILD" ]; then - export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib" - export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" - fi # Taken from ../python3-adblock/template maturin build -o . --release --target "${RUST_TARGET}" --manylinux off mkdir -p dist