LBRYCommunity/kivy-ios
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

toolchain: force the optional recipe to load when it's already compiled

Browse source
This commit is contained in:
Mathieu Virbel 2015-08-14 16:11:47 +02:00
parent 7cb22bd0ec
commit 9ccb6b4c00
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toolchain.py
View file

@ -523,7 +523,7 @@ class Recipe(object):
else: else:
include_dir = join("common", self.name) include_dir = join("common", self.name)
if include_dir: if include_dir:
#print("Include dir added: {}".format(include_dir)) print("Include dir added: {}".format(include_dir))
self.ctx.include_dirs.append(include_dir) self.ctx.include_dirs.append(include_dir)
def get_recipe_env(self, arch=None): def get_recipe_env(self, arch=None):
@ -902,15 +902,17 @@ def build_recipes(names, ctx):
print("ERROR: No recipe named {}".format(name)) print("ERROR: No recipe named {}".format(name))
sys.exit(1) sys.exit(1)
graph.add(name, name) graph.add(name, name)
print("Loaded recipe {} (depends of {})".format(name, recipe.depends)) print("Loaded recipe {} (depends of {}, optional are {})".format(name,
recipe.depends, recipe.optional_depends))
for depend in recipe.depends: for depend in recipe.depends:
graph.add(name, depend) graph.add(name, depend)
recipe_to_load += recipe.depends recipe_to_load += recipe.depends
for depend in recipe.optional_depends: for depend in recipe.optional_depends:
# in case of compilation after the initial one, take in account # in case of compilation after the initial one, take in account
# of the already compiled recipes # of the already compiled recipes
key = "{}.build_all".format(name) key = "{}.build_all".format(depend)
if key in ctx.state: if key in ctx.state:
recipe_to_load.append(name)
graph.add(name, depend) graph.add(name, depend)
else: else:
graph.add_optional(name, depend) graph.add_optional(name, depend)