sys-libs/glibc: python pkg_setup fails during bootstrap.

Glibc-2.29 introduces a new python dependency for building. However,
during Prefix bootstrap, glibc has to be built before python.  The
dependency circle is broken by disabling pkg_setup() of
python-any-r1.eclass.

Bug: https://bugs.gentoo.org/682570
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index e675e2b5c1461ea3a271be4be96b2d74e14ff0fe..0e1db7e3c8534cd4871e9233778b80806fb997e2 100644 (file)
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -719,6 +719,10 @@ pkg_pretend() {
        sanity_prechecks
 }
 
+pkg_setup() {
+       [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
 # src_unpack
 
 src_unpack() {

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 478b5e5c9dc6fb88b4f6a157993ca3e40327e34a..ba1d5041cb740f34a9387181e539fbf3a84acbd3 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -720,6 +720,10 @@ pkg_pretend() {
        sanity_prechecks
 }
 
+pkg_setup() {
+       [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
+}
+
 # src_unpack
 
 src_unpack() {