public inbox for gentoo-portage-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-portage-dev <gentoo-portage-dev@lists.gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] Add icecream support
Date: Wed, 7 Oct 2015 17:38:53 -0700	[thread overview]
Message-ID: <20151007173853.167a820b.dolsen@gentoo.org> (raw)


The following is an cleaned up version of the github pull request:
https://github.com/gentoo/portage/pull/12


From 76fad935d511b4a11d10bdff4c0b0d13b5ca1ad3 Mon Sep 17 00:00:00 2001
From: Igor Savlook <igorsavlook@gmail.com>
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 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"]
-- 
2.5.3


-- 
Brian Dolbec <dolsen>



             reply	other threads:[~2015-10-08  0:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-08  0:38 Brian Dolbec [this message]
2015-10-08  0:45 ` [gentoo-portage-dev] [PATCH] Add icecream support Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151007173853.167a820b.dolsen@gentoo.org \
    --to=dolsen@gentoo.org \
    --cc=gentoo-portage-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox