[patch] patch

catalyst.patch (text/plain), 1006 bytes, created by Andrew Gaffney (RETIRED) on 2007-04-27 02:29:40 UTC

Index: targets/support/chroot-functions.sh
===================================================================
--- targets/support/chroot-functions.sh	(revision 1234)
+++ targets/support/chroot-functions.sh	(working copy)
@@ -61,6 +61,14 @@
 		#fi
 		mkdir -p /etc/distcc
 		echo "${clst_distcc_hosts}" > /etc/distcc/hosts
+
+		# This sets up automatic cross-distcc-fu according to http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
+		CHOST=$(portageq envvar CHOST)
+		cd /usr/lib/distcc/bin
+		rm cc gcc g++ c++ 2>/dev/null
+		echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+		chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
+		for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
 	fi
 }
 
@@ -121,6 +129,11 @@
 
 cleanup_distcc() {
 	rm -rf /etc/distcc/hosts
+	for i in cc gcc c++ g++; do
+		rm /usr/lib/distcc/bin/${i}
+		ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
+	done
+	rm /usr/lib/distcc/bin/*-wrapper
 }
 
 update_env_settings(){