View | Details | Raw Unified
Collapse All | Expand All

(-) catalyst (+4 lines)
 Lines 113-118    Link Here 
		print "Distcc support enabled."
		print "Distcc support enabled."
		conf_values["DISTCC"]="1"
		conf_values["DISTCC"]="1"
	if "icecream" in string.split(conf_values["options"]):
		print "Icecream compiler cluster support enabled."
		conf_values["ICECREAM"]="1"
	if "kerncache" in string.split(conf_values["options"]):
	if "kerncache" in string.split(conf_values["options"]):
		print "Kernel cache support enabled."
		print "Kernel cache support enabled."
		conf_values["KERNCACHE"]="1"
		conf_values["KERNCACHE"]="1"
(-) modules/generic_stage_target.py (+5 lines)
 Lines 202-207    Link Here 
			# for the chroot:
			# for the chroot:
			self.env["CCACHE_DIR"]="/var/tmp/ccache"	
			self.env["CCACHE_DIR"]="/var/tmp/ccache"	
		if self.settings.has_key("ICECREAM"):
			self.mounts.append("/var/cache/icecream")
			self.mountmap["/var/cache/icecream"]="/var/cache/icecream"
			self.env["PATH"]="/usr/lib/icecc/bin:"+self.env["PATH"]
	def override_cbuild(self):
	def override_cbuild(self):
		if self.makeconf.has_key("CBUILD"):
		if self.makeconf.has_key("CBUILD"):
			self.settings["CBUILD"]=self.makeconf["CBUILD"]
			self.settings["CBUILD"]=self.makeconf["CBUILD"]
(-) modules/catalyst_support.py (+1 lines)
 Lines 154-159    Link Here 
valid_config_file_values.append("KERNCACHE")
valid_config_file_values.append("KERNCACHE")
valid_config_file_values.append("CCACHE")
valid_config_file_values.append("CCACHE")
valid_config_file_values.append("DISTCC")
valid_config_file_values.append("DISTCC")
valid_config_file_values.append("ICECREAM")
valid_config_file_values.append("ENVSCRIPT")
valid_config_file_values.append("ENVSCRIPT")
valid_config_file_values.append("AUTORESUME")
valid_config_file_values.append("AUTORESUME")
valid_config_file_values.append("FETCH")
valid_config_file_values.append("FETCH")
(-) targets/support/chroot-functions.sh (+26 lines)
 Lines 99-104    Link Here 
		chmod a+x /usr/lib/distcc/bin/${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
		for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
	fi
	fi
	if [ -n "${clst_ICECREAM}" ]
	then
		clst_root_path=/ run_emerge --oneshot --nodeps 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
		CHOST=$(portageq envvar CHOST)
		LIBDIR=$(get_libdir)
		cd /usr/${LIBDIR}/icecc/bin
		rm cc gcc g++ c++ 2>/dev/null
		echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/icecc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
		chmod a+x ${CHOST}-wrapper
		for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
		export PATH="/usr/lib/icecc/bin:${PATH}"
		export PREROOTPATH="/usr/lib/icecc/bin"
	fi
}
}
setup_myemergeopts(){
setup_myemergeopts(){
 Lines 166-171    Link Here 
	rm /usr/lib/distcc/bin/*-wrapper
	rm /usr/lib/distcc/bin/*-wrapper
}
}
cleanup_icecream() {
	LIBDIR=$(get_libdir)
	for i in cc gcc c++ g++; do
		rm /usr/${LIBDIR}/icecc/bin/${i}
		ln -s /usr/bin/icecc /usr/${LIBDIR}/icecc/bin/${i}
	done
	rm /usr/${LIBDIR}/icecc/bin/*-wrapper
}
update_env_settings(){
update_env_settings(){
	/usr/sbin/env-update
	/usr/sbin/env-update
	source /etc/profile
	source /etc/profile
(-) targets/stage2/stage2-preclean-chroot.sh (+6 lines)
 Lines 15-18    Link Here 
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	run_emerge -C sys-devel/icecream || exit 1
	cleanup_icecream
fi
rm -f /var/log/emerge.log
rm -f /var/log/emerge.log
(-) targets/stage3/stage3-preclean-chroot.sh (+6 lines)
 Lines 15-18    Link Here 
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	run_emerge -C sys-devel/icecream || exit 1
	cleanup_icecream
fi
rm -f /var/log/emerge.log
rm -f /var/log/emerge.log
(-) targets/grp/grp-preclean-chroot.sh (+5 lines)
 Lines 8-11    Link Here 
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	cleanup_icecream
fi
gconftool-2 --shutdown
gconftool-2 --shutdown
(-) targets/livecd-stage1/livecd-stage1-preclean-chroot.sh (+5 lines)
 Lines 7-9    Link Here 
then
then
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	cleanup_icecream
fi
(-) targets/embedded/embedded-preclean-chroot.sh (+5 lines)
 Lines 7-9    Link Here 
then
then
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	cleanup_icecream
fi
(-) targets/tinderbox/tinderbox-preclean-chroot.sh (+5 lines)
 Lines 7-9    Link Here 
then
then
	cleanup_distcc
	cleanup_distcc
fi
fi
if [ -n "${clst_ICECREAM}" ]
then
	cleanup_icecream
fi