commit: 76fad935d511b4a11d10bdff4c0b0d13b5ca1ad3
Author: Igor Savlook <igorsavlook <AT> gmail <DOT> com>
AuthorDate: Thu Oct 8 00:31:23 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 00:31:23 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=76fad935
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 CFLAGS
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 = frozenset([
"force-mirror",
"force-prefix",
"getbinpkg",
+ "icecream",
"installsources",
"ipc-sandbox",
"keeptemp",
diff --git a/pym/portage/package/ebuild/doebuild.py
b/pym/portage/package/ebuild/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=None,
settings=None,
ccache = "ccache" in mysettings.features
distcc = "distcc" in mysettings.features
- if ccache or distcc:
+ icecream = "icecream" in mysettings.features
+
+ if ccache or distcc or icecream:
# Use default ABI libdir in accordance with bug #355283.
libdir = None
default_abi = mysettings.get("DEFAULT_ABI")
@@ -478,6 +480,10 @@ def doebuild_environment(myebuild, mydo, myroot=None,
settings=None,
mysettings["PATH"] = os.path.join(os.sep,
eprefix_lstrip,
"usr", libdir, "distcc", "bin") + ":"
+ mysettings["PATH"]
+ if icecream:
+ mysettings["PATH"] = os.path.join(os.sep,
eprefix_lstrip,
+ "usr", 'libexec', "icecc", "bin") + ":"
+ mysettings["PATH"]
+
if ccache:
mysettings["PATH"] = os.path.join(os.sep,
eprefix_lstrip,
"usr", libdir, "ccache", "bin") + ":"
+ mysettings["PATH"]
