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 EAFD0138334 for ; Sun, 30 Dec 2018 01:10:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F15ECE0A4F; Sun, 30 Dec 2018 01:10:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 CA1E0E0A4F for ; Sun, 30 Dec 2018 01:10:42 +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 8D082335C31 for ; Sun, 30 Dec 2018 01:10:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 637C14FA for ; Sun, 30 Dec 2018 01:10:38 +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: <1546132217.4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50.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: 4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50 X-VCS-Branch: master Date: Sun, 30 Dec 2018 01:10:38 +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: 610658c8-fe1e-428f-8d65-9dd0a8a63f3a X-Archives-Hash: 1b8d84284c6011586abf4a40aa0b2805 commit: 4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50 Author: Benda Xu gentoo org> AuthorDate: Sat Dec 29 10:49:12 2018 +0000 Commit: Benda XU gentoo org> CommitDate: Sun Dec 30 01:10:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4c718cec Revert "scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam Pfeiffer" Not needed anymore: We are now able to pass use flags from the env. This reverts commit f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5. Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index ea6bc9313f..6af97eaba6 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1549,20 +1549,9 @@ bootstrap_stage2() { [[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \ >> "${ROOT}"/tmp/etc/portage/package.mask - # kill some dependencies here while we're still fragile - { - # cmake has some external dependencies which require autoconf, etc. - # unless we only build the buildtool, bug #603012 - echo "dev-util/cmake -server" - # avoid sys-apps/acl -> attr -> gettext cycle on Linux - echo "sys-devel/gettext -acl" - # gdbm depends on berkdb by default, which pulls in binutils - echo "dev-lang/perl -gdbm -berkdb" - # package needs perl, nls pulls in specific package - echo "sys-apps/help2man -nls" - # avoid hefty set of deps from glib - echo "dev-util/pkgconfig internal-glib" - } >> "${ROOT}"/tmp/etc/portage/package.use + # cmake has some external dependencies which require autoconf, etc. + # unless we only build the buildtool, bug #603012 + echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use emerge_pkgs --nodeps "${pkgs[@]}" || return 1