commit:     3d081cb997d18d200c71e1ff394e17db2f01f38d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 21:02:52 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 21:02:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d081cb9

sys-libs/glibc: drop Python 3.10 from PYTHON_COMPAT to avoid circular deps

Needed for now to try help upgrades and avoid circular dependencies
with glibc -> python -> libcrypt -> libxcrypt -> glibc -> ...

Bug: https://bugs.gentoo.org/699422
Bug: https://bugs.gentoo.org/702806
Bug: https://bugs.gentoo.org/809410
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/glibc/glibc-2.33-r7.ebuild | 5 ++++-
 sys-libs/glibc/glibc-2.34-r1.ebuild | 5 ++++-
 sys-libs/glibc/glibc-9999.ebuild    | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.33-r7.ebuild 
b/sys-libs/glibc/glibc-2.33-r7.ebuild
index cb9826d7be2..20390ea8ba2 100644
--- a/sys-libs/glibc/glibc-2.33-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r7.ebuild
@@ -3,7 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular 
dependencies
+# on upgrades as people migrate to libxcrypt.
+# 
https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt
+PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic 
gnuconfig \

diff --git a/sys-libs/glibc/glibc-2.34-r1.ebuild 
b/sys-libs/glibc/glibc-2.34-r1.ebuild
index 461ad27a5e2..f5d98be9cf6 100644
--- a/sys-libs/glibc/glibc-2.34-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r1.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
 # Please read & adapt the page as necessary if obsolete.
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular 
dependencies
+# on upgrades as people migrate to libxcrypt.
+# 
https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt
+PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic 
gnuconfig \

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index b08e07445f5..ce5ad8d3c43 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -6,7 +6,10 @@ EAPI=7
 # Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
 # Please read & adapt the page as necessary if obsolete.
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+# We avoid Python 3.10 here _for now_ (it does work!) to avoid circular 
dependencies
+# on upgrades as people migrate to libxcrypt.
+# 
https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Python_and_libcrypt
+PYTHON_COMPAT=( python3_{7,8,9} )
 TMPFILES_OPTIONAL=1
 
 inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic 
gnuconfig \

Reply via email to