[gentoo-commits] catalyst r1408 - in trunk: . targets/support

[Chris Gianelloni (wolf31o2)]

Author: wolf31o2
Date: 2008-05-09 03:59:30 +0000 (Fri, 09 May 2008)
New Revision: 1408

Modified:
   trunk/ChangeLog
   trunk/targets/support/chroot-functions.sh
Log:
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.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-05-09 02:26:39 UTC (rev 1407)
+++ trunk/ChangeLog	2008-05-09 03:59:30 UTC (rev 1408)
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  09 May 2008; Chris Gianelloni <wolf31o2@g.o>
+  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@g.o> TODO:
   Add a couple of distcc-related items to TODO.
 

Modified: trunk/targets/support/chroot-functions.sh
===================================================================
--- trunk/targets/support/chroot-functions.sh	2008-05-09 02:26:39 UTC (rev 1407)
+++ trunk/targets/support/chroot-functions.sh	2008-05-09 03:59:30 UTC (rev 1408)
@@ -77,6 +77,8 @@
 		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

-- 
gentoo-commits@l.g.o mailing list