summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-09-24 07:49:50 +0000
committerZac Medico <zmedico@gentoo.org>2006-09-24 07:49:50 +0000
commitabbba16da7af46d01f5f4d5ba2eb514105deebb3 (patch)
treedf68163aaae712389985518b13131efac4d629c0
parent3b71c82785e787553397921a3b122c77b5b8cbd8 (diff)
downloadportage-abbba16da7af46d01f5f4d5ba2eb514105deebb3.tar.gz
portage-abbba16da7af46d01f5f4d5ba2eb514105deebb3.tar.bz2
portage-abbba16da7af46d01f5f4d5ba2eb514105deebb3.zip
In order to ensure correct merge order such that build time dependencies will really be usable, don't treat RDEPEND as soft_deps. Thanks for Jason Stubbs for recognizing this issue.
svn path=/main/trunk/; revision=4522
-rwxr-xr-xbin/emerge7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index c0c82058d..eb3547c35 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -858,8 +858,13 @@ class depgraph:
if not self.select_dep("/", edepend["DEPEND"], myparent=mp,
myuse=myuse):
return 0
+ """RDEPEND is soft by definition. However, in order to ensure
+ correct merge order, we make it a hard dependency. Otherwise, a
+ build time dependency might not be usable due to it's run time
+ dependencies not being installed yet.
+ """
if not self.select_dep(myroot,edepend["RDEPEND"], myparent=mp,
- myuse=myuse, soft_deps=True):
+ myuse=myuse, soft_deps=False):
return 0
if edepend.has_key("PDEPEND") and edepend["PDEPEND"]:
# Post Depend -- Add to the list without a parent, as it depends