From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C0EE1381F3 for ; Mon, 11 May 2020 06:59:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 801C9E086F; Mon, 11 May 2020 06:59:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6432FE086F for ; Mon, 11 May 2020 06:59:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8063934F67A for ; Mon, 11 May 2020 06:59:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3444A26 for ; Mon, 11 May 2020 06:59:34 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1589180299.b8998ebd8595fcae2a13ea8050bdb758726e1275.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: b8998ebd8595fcae2a13ea8050bdb758726e1275 X-VCS-Branch: master Date: Mon, 11 May 2020 06:59:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c46fe7f-f629-49b6-89b7-bf348bc79094 X-Archives-Hash: 6fd80c13d52050a58ae0e7efc20ba44c commit: b8998ebd8595fcae2a13ea8050bdb758726e1275 Author: Benda Xu gentoo org> AuthorDate: Sat May 9 07:53:37 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Mon May 11 06:58:19 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b8998ebd bootstrap-prefix.sh: gawk depends on texinfo. gawk has to be merged with --nodeps. Closes: https://bugs.gentoo.org/717786 Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 25e091c37a..3e36df7396 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1999,6 +1999,9 @@ bootstrap_stage3() { rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf + # need special care, it depends on texinfo, #717786 + emerge_pkgs --nodeps sys-apps/gawk || return 1 + ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f python${PYTHONMAJMIN} ) # Use $ROOT tools where possible from now on. if [[ $(readlink "${ROOT}"/bin/sh) == "${ROOT}/tmp/"* ]] ; then @@ -2021,7 +2024,6 @@ bootstrap_stage3() { app-arch/gzip app-arch/tar sys-apps/grep - sys-apps/gawk sys-devel/make sys-apps/file app-admin/eselect