We need to run distcc-config --install, since we won't be installing into ROOT=/...

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 fb9e97263f427139830606ea8e817de671533efb..2aee374648f4c28748e4ccca4015d5734f0afdf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  09 May 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  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 <wolf31o2@gentoo.org> 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 418336cd1c0f2db2a91f2b7a544be9e21544b9be..a11617e03c3fc6c0229b76adce70120bba1a4b2f 100755 (executable)
--- 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