From: Chris Gianelloni Date: Fri, 9 May 2008 03:59:30 +0000 (+0000) Subject: We need to run distcc-config --install, since we won't be installing into ROOT=/... X-Git-Tag: CATALYST_2_0_6_916~86 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35846b6e6d4c88c0d9e3060009ad89f92ba361ee;p=catalyst.git We need to run distcc-config --install, since we won't be installing into ROOT=/ for stage1, and we have to use --noreplace to keep from wiping any installed versions of distcc. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1408 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index fb9e9726..2aee3746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 09 May 2008; Chris Gianelloni + targets/support/chroot-functions.sh: + We need to run distcc-config --install, since we won't be installing into + ROOT=/ for stage1, and we have to use --noreplace to keep from wiping any + installed versions of distcc. + 09 May 2008; Chris Gianelloni TODO: Add a couple of distcc-related items to TODO. diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 418336cd..a11617e0 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -77,6 +77,8 @@ setup_myfeatures(){ sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf mkdir -p /etc/distcc echo "${clst_distcc_hosts}" > /etc/distcc/hosts + # We need to run distcc-config, since it might not have gotten run + [ -x /usr/bin/distcc-config ] && /usr/bin/distcc-config --install # This sets up automatic cross-distcc-fu according to # http://www.gentoo.org/doc/en/cross-compiling-distcc.xml