From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 29F4813888F for ; Thu, 8 Oct 2015 00:39:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AB95E0855; Thu, 8 Oct 2015 00:39:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3F28E0853 for ; Thu, 8 Oct 2015 00:39:46 +0000 (UTC) Received: from professor-x (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 63EFC340139 for ; Thu, 8 Oct 2015 00:39:43 +0000 (UTC) Date: Wed, 7 Oct 2015 17:38:53 -0700 From: Brian Dolbec To: gentoo-portage-dev Subject: [gentoo-portage-dev] [PATCH] Add icecream support Message-ID: <20151007173853.167a820b.dolsen@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Archives-Salt: bd94c56e-343c-429d-84fb-2981f0f93e09 X-Archives-Hash: 648c79d0b4a118223748f3c4f6e502a0 The following is an cleaned up version of the github pull request: https://github.com/gentoo/portage/pull/12 =46rom 76fad935d511b4a11d10bdff4c0b0d13b5ca1ad3 Mon Sep 17 00:00:00 2001 From: Igor Savlook Date: Wed, 7 Oct 2015 17:31:23 -0700 Subject: [PATCH] Add icecream support --- man/make.conf.5 | 3 +++ pym/portage/const.py | 1 + pym/portage/package/ebuild/doebuild.py | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/man/make.conf.5 b/man/make.conf.5 index 13b8042..1d1cfeb 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -411,6 +411,9 @@ for all EAPIs (for obvious reasons). Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR.= See \fBmake.conf\fR(5) for more information. .TP +.B icecream +Enable portage support for the icecream package. +.TP .B installsources Install source code into /usr/src/debug/${CATEGORY}/${PF} (also see \fBsplitdebug\fR). This feature works only if debugedit is installed and C= FLAGS diff --git a/pym/portage/const.py b/pym/portage/const.py index 722893e..6c4f613 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -148,6 +148,7 @@ SUPPORTED_FEATURES =3D frozenset([ "force-mirror", "force-prefix", "getbinpkg", + "icecream", "installsources", "ipc-sandbox", "keeptemp", diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/e= build/doebuild.py index 5e4d7b1..431a013 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -465,7 +465,9 @@ def doebuild_environment(myebuild, mydo, myroot=3DNone,= settings=3DNone, =20 ccache =3D "ccache" in mysettings.features distcc =3D "distcc" in mysettings.features - if ccache or distcc: + icecream =3D "icecream" in mysettings.features + + if ccache or distcc or icecream: # Use default ABI libdir in accordance with bug #355283. libdir =3D None default_abi =3D mysettings.get("DEFAULT_ABI") @@ -478,6 +480,10 @@ def doebuild_environment(myebuild, mydo, myroot=3DNone= , settings=3DNone, mysettings["PATH"] =3D os.path.join(os.sep, eprefix_lstrip, "usr", libdir, "distcc", "bin") + ":" + mysettings["PATH"] =20 + if icecream: + mysettings["PATH"] =3D os.path.join(os.sep, eprefix_lstrip, + "usr", 'libexec', "icecc", "bin") + ":" + mysettings["PATH"] + if ccache: mysettings["PATH"] =3D os.path.join(os.sep, eprefix_lstrip, "usr", libdir, "ccache", "bin") + ":" + mysettings["PATH"] --=20 2.5.3 --=20 Brian Dolbec