Attachment #274111 for bug #288597

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

Lines 1071-1076 dyn_compile() { Link Here

(-)a/bin/ebuild.sh (+7 lines)
1071		1071
1072	trap abort_compile SIGINT SIGQUIT	1072	trap abort_compile SIGINT SIGQUIT
1073		1073
		1074	if hasq distcc $FEATURES && hasq distcc-pump $FEATURES ; then
		1075	if [[ -z $INCLUDE_SERVER_PORT ]] \|\| [[ ! -w $INCLUDE_SERVER_PORT ]] ; then
		1076	eval $(/usr/bin/pump --startup)
		1077	trap "/usr/bin/pump --shutdown" EXIT
		1078	fi
		1079	fi
		1080
1074	ebuild_phase pre_src_compile	1081	ebuild_phase pre_src_compile
1075		1082
1076	vecho ">>> Compiling source in $PWD ..."	1083	vecho ">>> Compiling source in $PWD ..."

Lines 257-262 will be reused whenever they are available. Link Here

(-)a/man/make.conf.5 (+3 lines)
257	.B distcc	257	.B distcc
258	Enable portage support for the distcc package.	258	Enable portage support for the distcc package.
259	.TP	259	.TP
		260	.B distcc-pump
		261	Enable portage support for the distcc package with pump mode.
		262	.TP
260	.B distlocks	263	.B distlocks
261	Portage uses lockfiles to ensure competing instances don't clobber	264	Portage uses lockfiles to ensure competing instances don't clobber
262	each other's files. This feature is enabled by default but may cause	265	each other's files. This feature is enabled by default but may cause

Lines 33-39 class EbuildPhase(CompositeTask): Link Here

(-)a/pym/_emerge/EbuildPhase.py (-1 / +1 lines)
33	("_ebuild_lock",)	33	("_ebuild_lock",)
34		34
35	# FEATURES displayed prior to setup phase	35	# FEATURES displayed prior to setup phase
36	_features_display = ("ccache", "distcc", "fakeroot",	36	_features_display = ("ccache", "distcc", "distcc-pump", "fakeroot",
37	"installsources", "keeptemp", "keepwork", "nostrip",	37	"installsources", "keeptemp", "keepwork", "nostrip",
38	"preserve-libs", "sandbox", "selinux", "sesandbox",	38	"preserve-libs", "sandbox", "selinux", "sesandbox",
39	"splitdebug", "suidctl", "test", "userpriv",	39	"splitdebug", "suidctl", "test", "userpriv",

Lines 88-94 EBUILD_PHASES = ("pretend", "setup", "unpack", "prepare", "configure" Link Here

(-)a/pym/portage/const.py (-2 / +1 lines)
88	SUPPORTED_FEATURES = frozenset([	88	SUPPORTED_FEATURES = frozenset([
89	"assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy",	89	"assume-digests", "binpkg-logs", "buildpkg", "buildsyspkg", "candy",
90	"ccache", "chflags", "collision-protect", "compress-build-logs",	90	"ccache", "chflags", "collision-protect", "compress-build-logs",
91	"digest", "distcc", "distlocks", "ebuild-locks", "fakeroot",	91	"digest", "distcc", "distcc-pump", "distlocks", "ebuild-locks", "fakeroot",
92	"fail-clean", "fixpackages", "force-mirror", "getbinpkg",	92	"fail-clean", "fixpackages", "force-mirror", "getbinpkg",
93	"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",	93	"installsources", "keeptemp", "keepwork", "fixlafiles", "lmirror",
94	"metadata-transfer", "mirror", "multilib-strict", "news",	94	"metadata-transfer", "mirror", "multilib-strict", "news",
95	-

Return to bug 288597