Attachment #598656 for bug #702146

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




	trap - SIGINT SIGQUIT
}

# @FUNCTION: __start_distcc
# @DESCRIPTION:
# Start distcc-pump if necessary.
__start_distcc() {
	if has distcc $FEATURES && has distcc-pump $FEATURES ; then
		if [[ -z $INCLUDE_SERVER_PORT ]] || [[ ! -w $INCLUDE_SERVER_PORT ]] ; then
			# adding distcc to PATH repeatedly results in fatal distcc recursion :)
			eval $(pump --startup | grep -v PATH)
			trap "pump --shutdown >/dev/null" EXIT
		fi
	fi
}

__dyn_configure() {

	if [[ -e $PORTAGE_BUILDDIR/.configured ]] ; then

	fi

	trap __abort_configure SIGINT SIGQUIT
	__start_distcc

	__ebuild_phase pre_src_configure


	fi

	trap __abort_compile SIGINT SIGQUIT
	__start_distcc

	__ebuild_phase pre_src_compile


	fi

	trap "__abort_test" SIGINT SIGQUIT
	__start_distcc

	if [[ -d ${S} ]]; then
		cd "${S}"

		return 0
	fi
	trap "__abort_install" SIGINT SIGQUIT
	__start_distcc

	# Handle setting QA_* based on QA_PREBUILT
	# Those variables shouldn't be needed before src_install()

Lines 49-55 class EbuildPhase(CompositeTask): Link Here

(-)a/lib/_emerge/EbuildPhase.py (-1 / +1 lines)
49		49
50	# FEATURES displayed prior to setup phase	50	# FEATURES displayed prior to setup phase
51	_features_display = (	51	_features_display = (
52	"ccache", "compressdebug", "distcc", "distcc-pump", "fakeroot",	52	"ccache", "compressdebug", "distcc", "fakeroot",
53	"installsources", "keeptemp", "keepwork", "network-sandbox",	53	"installsources", "keeptemp", "keepwork", "network-sandbox",
54	"network-sandbox-proxy", "nostrip", "preserve-libs", "sandbox",	54	"network-sandbox-proxy", "nostrip", "preserve-libs", "sandbox",
55	"selinux", "sesandbox", "splitdebug", "suidctl", "test",	55	"selinux", "sesandbox", "splitdebug", "suidctl", "test",

Lines 142-148 SUPPORTED_FEATURES = frozenset([ Link Here

(-)a/lib/portage/const.py (-2 lines)
142	"config-protect-if-modified",	142	"config-protect-if-modified",
143	"digest",	143	"digest",
144	"distcc",	144	"distcc",
145	"distcc-pump",
146	"distlocks",	145	"distlocks",
147	"downgrade-backup",	146	"downgrade-backup",
148	"ebuild-locks",	147	"ebuild-locks",
149	-

Return to bug 702146

Lines 403-421 __dyn_prepare() { Link Here

(-)a/bin/phase-functions.sh (-17 lines)
403	trap - SIGINT SIGQUIT	403	trap - SIGINT SIGQUIT
404	}	404	}
405		405
406	# @FUNCTION: __start_distcc
407	# @DESCRIPTION:
408	# Start distcc-pump if necessary.
409	__start_distcc() {
410	if has distcc $FEATURES && has distcc-pump $FEATURES ; then
411	if [[ -z $INCLUDE_SERVER_PORT ]] \|\| [[ ! -w $INCLUDE_SERVER_PORT ]] ; then
412	# adding distcc to PATH repeatedly results in fatal distcc recursion :)
413	eval $(pump --startup \| grep -v PATH)
414	trap "pump --shutdown >/dev/null" EXIT
415	fi
416	fi
417	}
418
419	__dyn_configure() {	406	__dyn_configure() {
420		407
421	if [[ -e $PORTAGE_BUILDDIR/.configured ]] ; then	408	if [[ -e $PORTAGE_BUILDDIR/.configured ]] ; then
Lines 435-441 __dyn_configure() { Link Here
435	fi	422	fi
436		423
437	trap __abort_configure SIGINT SIGQUIT	424	trap __abort_configure SIGINT SIGQUIT
438	__start_distcc
439		425
440	__ebuild_phase pre_src_configure	426	__ebuild_phase pre_src_configure
441		427
Lines 469-475 __dyn_compile() { Link Here
469	fi	455	fi
470		456
471	trap __abort_compile SIGINT SIGQUIT	457	trap __abort_compile SIGINT SIGQUIT
472	__start_distcc
473		458
474	__ebuild_phase pre_src_compile	459	__ebuild_phase pre_src_compile
475		460
Lines 493-499 __dyn_test() { Link Here
493	fi	478	fi
494		479
495	trap "__abort_test" SIGINT SIGQUIT	480	trap "__abort_test" SIGINT SIGQUIT
496	__start_distcc
497		481
498	if [[ -d ${S} ]]; then	482	if [[ -d ${S} ]]; then
499	cd "${S}"	483	cd "${S}"
Lines 541-547 __dyn_install() { Link Here
541	return 0	525	return 0
542	fi	526	fi
543	trap "__abort_install" SIGINT SIGQUIT	527	trap "__abort_install" SIGINT SIGQUIT
544	__start_distcc
545		528
546	# Handle setting QA_* based on QA_PREBUILT	529	# Handle setting QA_* based on QA_PREBUILT
547	# Those variables shouldn't be needed before src_install()	530	# Those variables shouldn't be needed before src_install()