Attachment #136784 for bug #200095

View | Details | Raw Unified | Return to bug 200095
Collapse All | Expand All

Lines 113-118 Link Here

(-)catalyst (+4 lines)
113	print "Distcc support enabled."	113	print "Distcc support enabled."
114	conf_values["DISTCC"]="1"	114	conf_values["DISTCC"]="1"
115		115
		116	if "icecream" in string.split(conf_values["options"]):
		117	print "Icecream compiler cluster support enabled."
		118	conf_values["ICECREAM"]="1"
		119
116	if "kerncache" in string.split(conf_values["options"]):	120	if "kerncache" in string.split(conf_values["options"]):
117	print "Kernel cache support enabled."	121	print "Kernel cache support enabled."
118	conf_values["KERNCACHE"]="1"	122	conf_values["KERNCACHE"]="1"

Lines 202-207 Link Here

(-)modules/generic_stage_target.py (+5 lines)
202	# for the chroot:	202	# for the chroot:
203	self.env["CCACHE_DIR"]="/var/tmp/ccache"	203	self.env["CCACHE_DIR"]="/var/tmp/ccache"
204		204
		205	if self.settings.has_key("ICECREAM"):
		206	self.mounts.append("/var/cache/icecream")
		207	self.mountmap["/var/cache/icecream"]="/var/cache/icecream"
		208	self.env["PATH"]="/usr/lib/icecc/bin:"+self.env["PATH"]
		209
205	def override_cbuild(self):	210	def override_cbuild(self):
206	if self.makeconf.has_key("CBUILD"):	211	if self.makeconf.has_key("CBUILD"):
207	self.settings["CBUILD"]=self.makeconf["CBUILD"]	212	self.settings["CBUILD"]=self.makeconf["CBUILD"]

Lines 154-159 Link Here

(-)modules/catalyst_support.py (+1 lines)
154	valid_config_file_values.append("KERNCACHE")	155	valid_config_file_values.append("KERNCACHE")
155	valid_config_file_values.append("CCACHE")	156	valid_config_file_values.append("CCACHE")
156	valid_config_file_values.append("DISTCC")	157	valid_config_file_values.append("DISTCC")
		158	valid_config_file_values.append("ICECREAM")
157	valid_config_file_values.append("ENVSCRIPT")	159	valid_config_file_values.append("ENVSCRIPT")
158	valid_config_file_values.append("AUTORESUME")	160	valid_config_file_values.append("AUTORESUME")
159	valid_config_file_values.append("FETCH")	161	valid_config_file_values.append("FETCH")




		chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
		for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
	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(){

	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(){
	/usr/sbin/env-update
	source /etc/profile

Lines 15-18 Link Here

(-)targets/stage2/stage2-preclean-chroot.sh (+6 lines)
15	cleanup_distcc	15	cleanup_distcc
16	fi	16	fi
17		17
		18	if [ -n "${clst_ICECREAM}" ]
		19	then
		20	run_emerge -C sys-devel/icecream \|\| exit 1
		21	cleanup_icecream
		22	fi
		23
18	rm -f /var/log/emerge.log	24	rm -f /var/log/emerge.log

Lines 15-18 Link Here

(-)targets/stage3/stage3-preclean-chroot.sh (+6 lines)
15	cleanup_distcc	15	cleanup_distcc
16	fi	16	fi
17		17
		18	if [ -n "${clst_ICECREAM}" ]
		19	then
		20	run_emerge -C sys-devel/icecream \|\| exit 1
		21	cleanup_icecream
		22	fi
		23
18	rm -f /var/log/emerge.log	24	rm -f /var/log/emerge.log

Lines 8-11 Link Here

(-)targets/grp/grp-preclean-chroot.sh (+5 lines)
8	cleanup_distcc	8	cleanup_distcc
9	fi	9	fi
10		10
		11	if [ -n "${clst_ICECREAM}" ]
		12	then
		13	cleanup_icecream
		14	fi
		15
11	gconftool-2 --shutdown	16	gconftool-2 --shutdown

Lines 7-9 Link Here

(-)targets/livecd-stage1/livecd-stage1-preclean-chroot.sh (+5 lines)
7	then	7	then
8	cleanup_distcc	8	cleanup_distcc
9	fi	9	fi
		10
		11	if [ -n "${clst_ICECREAM}" ]
		12	then
		13	cleanup_icecream
		14	fi

Lines 7-9 Link Here

(-)targets/embedded/embedded-preclean-chroot.sh (+5 lines)
7	then	7	then
8	cleanup_distcc	8	cleanup_distcc
9	fi	9	fi
		10
		11	if [ -n "${clst_ICECREAM}" ]
		12	then
		13	cleanup_icecream
		14	fi

Lines 7-9 Link Here

(-)targets/tinderbox/tinderbox-preclean-chroot.sh (+5 lines)
7	then	7	then
8	cleanup_distcc	8	cleanup_distcc
9	fi	9	fi
		10
		11	if [ -n "${clst_ICECREAM}" ]
		12	then
		13	cleanup_icecream
		14	fi

Return to bug 200095

Lines 99-104 Link Here

(-)targets/support/chroot-functions.sh (+26 lines)
99	chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper	99	chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
100	for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done	100	for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
101	fi	101	fi
		102
		103	if [ -n "${clst_ICECREAM}" ]
		104	then
		105	clst_root_path=/ run_emerge --oneshot --nodeps sys-devel/icecream \|\| exit 1
		106
		107	# This sets up automatic cross-icecc-fu according to
		108	# http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling
		109	CHOST=$(portageq envvar CHOST)
		110	LIBDIR=$(get_libdir)
		111	cd /usr/${LIBDIR}/icecc/bin
		112	rm cc gcc g++ c++ 2>/dev/null
		113	echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/icecc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
		114	chmod a+x ${CHOST}-wrapper
		115	for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
		116	export PATH="/usr/lib/icecc/bin:${PATH}"
		117	export PREROOTPATH="/usr/lib/icecc/bin"
		118	fi
102	}	119	}
103		120
104	setup_myemergeopts(){	121	setup_myemergeopts(){
Lines 166-171 Link Here
166	rm /usr/lib/distcc/bin/*-wrapper	183	rm /usr/lib/distcc/bin/*-wrapper
167	}	184	}
168		185
		186	cleanup_icecream() {
		187	LIBDIR=$(get_libdir)
		188	for i in cc gcc c++ g++; do
		189	rm /usr/${LIBDIR}/icecc/bin/${i}
		190	ln -s /usr/bin/icecc /usr/${LIBDIR}/icecc/bin/${i}
		191	done
		192	rm /usr/${LIBDIR}/icecc/bin/*-wrapper
		193	}
		194
169	update_env_settings(){	195	update_env_settings(){
170	/usr/sbin/env-update	196	/usr/sbin/env-update
171	source /etc/profile	197	source /etc/profile