1 |
The following is an cleaned up version of the github pull request: |
2 |
https://github.com/gentoo/portage/pull/12 |
3 |
|
4 |
|
5 |
From 76fad935d511b4a11d10bdff4c0b0d13b5ca1ad3 Mon Sep 17 00:00:00 2001 |
6 |
From: Igor Savlook <igorsavlook@×××××.com> |
7 |
Date: Wed, 7 Oct 2015 17:31:23 -0700 |
8 |
Subject: [PATCH] Add icecream support |
9 |
|
10 |
--- |
11 |
man/make.conf.5 | 3 +++ |
12 |
pym/portage/const.py | 1 + |
13 |
pym/portage/package/ebuild/doebuild.py | 8 +++++++- |
14 |
3 files changed, 11 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/man/make.conf.5 b/man/make.conf.5 |
17 |
index 13b8042..1d1cfeb 100644 |
18 |
--- a/man/make.conf.5 |
19 |
+++ b/man/make.conf.5 |
20 |
@@ -411,6 +411,9 @@ for all EAPIs (for obvious reasons). |
21 |
Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR. See |
22 |
\fBmake.conf\fR(5) for more information. |
23 |
.TP |
24 |
+.B icecream |
25 |
+Enable portage support for the icecream package. |
26 |
+.TP |
27 |
.B installsources |
28 |
Install source code into /usr/src/debug/${CATEGORY}/${PF} (also see |
29 |
\fBsplitdebug\fR). This feature works only if debugedit is installed and CFLAGS |
30 |
diff --git a/pym/portage/const.py b/pym/portage/const.py |
31 |
index 722893e..6c4f613 100644 |
32 |
--- a/pym/portage/const.py |
33 |
+++ b/pym/portage/const.py |
34 |
@@ -148,6 +148,7 @@ SUPPORTED_FEATURES = frozenset([ |
35 |
"force-mirror", |
36 |
"force-prefix", |
37 |
"getbinpkg", |
38 |
+ "icecream", |
39 |
"installsources", |
40 |
"ipc-sandbox", |
41 |
"keeptemp", |
42 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
43 |
index 5e4d7b1..431a013 100644 |
44 |
--- a/pym/portage/package/ebuild/doebuild.py |
45 |
+++ b/pym/portage/package/ebuild/doebuild.py |
46 |
@@ -465,7 +465,9 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, |
47 |
|
48 |
ccache = "ccache" in mysettings.features |
49 |
distcc = "distcc" in mysettings.features |
50 |
- if ccache or distcc: |
51 |
+ icecream = "icecream" in mysettings.features |
52 |
+ |
53 |
+ if ccache or distcc or icecream: |
54 |
# Use default ABI libdir in accordance with bug #355283. |
55 |
libdir = None |
56 |
default_abi = mysettings.get("DEFAULT_ABI") |
57 |
@@ -478,6 +480,10 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, |
58 |
mysettings["PATH"] = os.path.join(os.sep, eprefix_lstrip, |
59 |
"usr", libdir, "distcc", "bin") + ":" + mysettings["PATH"] |
60 |
|
61 |
+ if icecream: |
62 |
+ mysettings["PATH"] = os.path.join(os.sep, eprefix_lstrip, |
63 |
+ "usr", 'libexec', "icecc", "bin") + ":" + mysettings["PATH"] |
64 |
+ |
65 |
if ccache: |
66 |
mysettings["PATH"] = os.path.join(os.sep, eprefix_lstrip, |
67 |
"usr", libdir, "ccache", "bin") + ":" + mysettings["PATH"] |
68 |
-- |
69 |
2.5.3 |
70 |
|
71 |
|
72 |
-- |
73 |
Brian Dolbec <dolsen> |