| 1 |
commit: f99af4631f3251f9e10cbd048ab8638e027fe1b2 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 13 16:08:52 2019 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 13 16:13:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99af463 |
| 7 |
|
| 8 |
sys-libs/glibc: python pkg_setup fails during bootstrap. |
| 9 |
|
| 10 |
Glibc-2.29 introduces a new python dependency for building. However, |
| 11 |
during Prefix bootstrap, glibc has to be built before python. The |
| 12 |
dependency circle is broken by disabling pkg_setup() of |
| 13 |
python-any-r1.eclass. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/682570 |
| 16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 17 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 18 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-libs/glibc/glibc-2.29-r2.ebuild | 4 ++++ |
| 21 |
sys-libs/glibc/glibc-9999.ebuild | 4 ++++ |
| 22 |
2 files changed, 8 insertions(+) |
| 23 |
|
| 24 |
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild |
| 25 |
index e675e2b5c14..0e1db7e3c85 100644 |
| 26 |
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild |
| 27 |
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild |
| 28 |
@@ -719,6 +719,10 @@ pkg_pretend() { |
| 29 |
sanity_prechecks |
| 30 |
} |
| 31 |
|
| 32 |
+pkg_setup() { |
| 33 |
+ [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup |
| 34 |
+} |
| 35 |
+ |
| 36 |
# src_unpack |
| 37 |
|
| 38 |
src_unpack() { |
| 39 |
|
| 40 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 41 |
index 478b5e5c9dc..ba1d5041cb7 100644 |
| 42 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 43 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 44 |
@@ -720,6 +720,10 @@ pkg_pretend() { |
| 45 |
sanity_prechecks |
| 46 |
} |
| 47 |
|
| 48 |
+pkg_setup() { |
| 49 |
+ [[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup |
| 50 |
+} |
| 51 |
+ |
| 52 |
# src_unpack |
| 53 |
|
| 54 |
src_unpack() { |
Archives