From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 23 Mar 2010 23:24:29 +0000 (+0100)
Subject: naoki: Fix dependency tree resolution in toolchain stage.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e777ed08f3e304a3f3bb5c1d6b46a3a1be216ca;p=ipfire-3.x.git

naoki: Fix dependency tree resolution in toolchain stage.
---

diff --git a/naoki/backend.py b/naoki/backend.py
index 0d5cb4dcd..1fde02c18 100644
--- a/naoki/backend.py
+++ b/naoki/backend.py
@@ -86,7 +86,7 @@ def depsolve(packages, recursive=False, build=False, toolchain=False):
 		length = len(deps)
 		for dep in deps[:]:
 			deps.extend(dep.dependencies)
-			if build:
+			if build and not toolchain:
 				deps.extend(dep.dependencies_build)
 
 		new_deps = []
@@ -292,7 +292,7 @@ class PackageInfo(object):
 		deps = self.dependencies
 		if not self.__toolchain:
 			deps.extend(self.dependencies_build)
-		return depsolve(deps, build=True, recursive=True)
+		return depsolve(deps, build=True, recursive=True, toolchain=self.__toolchain)
 
 	@property
 	def dependencies_toolchain(self):