| 1 |
commit: b8998ebd8595fcae2a13ea8050bdb758726e1275 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 9 07:53:37 2020 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 11 06:58:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b8998ebd |
| 7 |
|
| 8 |
bootstrap-prefix.sh: gawk depends on texinfo. |
| 9 |
|
| 10 |
gawk has to be merged with --nodeps. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/717786 |
| 13 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 14 |
|
| 15 |
scripts/bootstrap-prefix.sh | 4 +++- |
| 16 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 19 |
index 25e091c37a..3e36df7396 100755 |
| 20 |
--- a/scripts/bootstrap-prefix.sh |
| 21 |
+++ b/scripts/bootstrap-prefix.sh |
| 22 |
@@ -1999,6 +1999,9 @@ bootstrap_stage3() { |
| 23 |
|
| 24 |
rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf |
| 25 |
|
| 26 |
+ # need special care, it depends on texinfo, #717786 |
| 27 |
+ emerge_pkgs --nodeps sys-apps/gawk || return 1 |
| 28 |
+ |
| 29 |
( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} ) |
| 30 |
# Use $ROOT tools where possible from now on. |
| 31 |
if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then |
| 32 |
@@ -2021,7 +2024,6 @@ bootstrap_stage3() { |
| 33 |
app-arch/gzip |
| 34 |
app-arch/tar |
| 35 |
sys-apps/grep |
| 36 |
- sys-apps/gawk |
| 37 |
sys-devel/make |
| 38 |
sys-apps/file |
| 39 |
app-admin/eselect |
Archives