diff options
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild (renamed from dev-python/bcrypt/bcrypt-4.2.0-r1.ebuild) | 7 | ||||
| -rw-r--r-- | dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch | 23 |
2 files changed, 30 insertions, 0 deletions
diff --git a/dev-python/bcrypt/bcrypt-4.2.0-r1.ebuild b/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild index 4dbf28e070d9..7399455166ac 100644 --- a/dev-python/bcrypt/bcrypt-4.2.0-r1.ebuild +++ b/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild @@ -77,6 +77,13 @@ distutils_enable_tests pytest export UNSAFE_PYO3_SKIP_VERSION_CHECK=1 +src_prepare() { + distutils-r1_src_prepare + + cd "${ECARGO_VENDOR}"/pyo3-0*/ || die + eapply "${FILESDIR}/bcrypt-4.2.0-patch-pyo3-subinterp.patch" +} + python_configure_all() { # Workaround for sys-cluster/ceph (bug #920906) # https://github.com/pyca/bcrypt/issues/694 diff --git a/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch b/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch new file mode 100644 index 000000000000..964dd964fa93 --- /dev/null +++ b/dev-python/bcrypt/files/bcrypt-4.2.0-patch-pyo3-subinterp.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/920906 +https://github.com/pyca/bcrypt/issues/694 +https://github.com/PyO3/pyo3/issues/3451 +https://src.fedoraproject.org/rpms/rust-pyo3/raw/rawhide/f/0001-Make-unsafe-subinterpreter-support-available-via-cfg.patch + +From d59176bc05aa37838fd4a8dd253f47c962f61118 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini <decathorpe@gmail.com> +Date: Tue, 23 Jul 2024 14:41:04 +0200 +Subject: [PATCH] Make unsafe subinterpreter support available via cfg flag + +--- a/src/impl_/pymodule.rs ++++ b/src/impl_/pymodule.rs +@@ -107,7 +107,7 @@ impl ModuleDef { + // that static data is not reused across interpreters. + // + // PyPy does not have subinterpreters, so no need to check interpreter ID. +- #[cfg(not(any(PyPy, GraalPy)))] ++ #[cfg(not(any(PyPy, GraalPy, pyo3_unsafe_allow_subinterpreters)))] + { + // PyInterpreterState_Get is only available on 3.9 and later, but is missing + // from python3.dll for Windows stable API on 3.9 +-- +2.45.2 |