From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 72528138010 for ; Fri, 28 Sep 2012 01:36:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AA0AE0943; Fri, 28 Sep 2012 01:35:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CC2A6E0943 for ; Fri, 28 Sep 2012 01:35:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 206D733C900 for ; Fri, 28 Sep 2012 01:35:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D3B31E544B for ; Fri, 28 Sep 2012 01:35:46 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1348795407.72f6115834b157c2cfd1abbd90b2ec2b95f2d60e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 72f6115834b157c2cfd1abbd90b2ec2b95f2d60e X-VCS-Branch: master Date: Fri, 28 Sep 2012 01:35:46 +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-Archives-Salt: e53ef0fd-3657-4cf0-bf7c-d74d88b8584d X-Archives-Hash: 8333e86e7b733e6c64baeccdf376529d commit: 72f6115834b157c2cfd1abbd90b2ec2b95f2d60e Author: Matt Turner gmail com> AuthorDate: Wed Sep 26 00:14:43 2012 +0000 Commit: Matt Turner gmail com> CommitDate: Fri Sep 28 01:23:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=72f61158 Don't emerge ccache/distcc/icecream with --nodeps ccache-3.1.8 changed to using tar.xz sources, which exposed a problem in catalyst where an old stage without xz would fail to seed a new stage using ccache. ccache's dependencies are zlib (and xz for >=ccache-3.1.8). distcc's are already part of stages: dev-libs/popt, virtual/pkgconfig, and sys-devel/gcc-config. icecream has no dependencies (???). Emerging with --nodeps only has the potential to cause problems. --- targets/support/chroot-functions.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 18e7a38..fecbad4 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -68,7 +68,7 @@ setup_myfeatures(){ if [ -n "${clst_CCACHE}" ] then export clst_myfeatures="${clst_myfeatures} ccache" - clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1 fi if [ -n "${clst_DISTCC}" ] @@ -83,9 +83,9 @@ setup_myfeatures(){ # reinstall if it isn't found. if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ] then - clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 + clst_root_path=/ run_merge --oneshot sys-devel/distcc || exit 1 else - clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1 fi sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf mkdir -p /etc/distcc @@ -104,7 +104,7 @@ setup_myfeatures(){ if [ -n "${clst_ICECREAM}" ] then - clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1 + clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1 # This sets up automatic cross-icecc-fu according to # http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling