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 407361382C5 for ; Thu, 10 Dec 2020 12:16:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68E9CE0900; Thu, 10 Dec 2020 12:16:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EEDDFE0900 for ; Thu, 10 Dec 2020 12:16:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 943023408A6 for ; Thu, 10 Dec 2020 12:16:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0533646C for ; Thu, 10 Dec 2020 12:16:50 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1607602561.1520dcb2fce8067598d15159e7e71976e2c85f6f.grobian@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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 1520dcb2fce8067598d15159e7e71976e2c85f6f X-VCS-Branch: master Date: Thu, 10 Dec 2020 12:16:50 +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: 75fff81a-d4bc-48b1-8011-84a42fcc3704 X-Archives-Hash: c85b58d5e9b2e455df468f1d93633d8a commit: 1520dcb2fce8067598d15159e7e71976e2c85f6f Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 10 12:16:01 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 10 12:16:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1520dcb2 Revert "scripts/bootstrap-prefix: fix gawk merge in stage3 for darwin9" This reverts commit 66588dcd0aa2508fad7ab8db5e92a0b4c2e75d6d. Since we disable readline in USE-flags, the readline dep shouldn't be there any more. Thanks Etienne Buira for the pointer. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index c7e30db10d..20748bde66 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -2040,8 +2040,7 @@ bootstrap_stage3() { rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf # need special care, it depends on texinfo, #717786 - # but requires a recent readline else breaks on old, e.g. darwin9 - pre_emerge_pkgs --nodeps sys-libs/readline sys-apps/gawk || return 1 + pre_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.