diff --git a/.ci/constants.py b/.ci/constants.py index 6be152a2..20403d3b 100644 --- a/.ci/constants.py +++ b/.ci/constants.py @@ -1,4 +1,4 @@ -BROKEN_RECIPES = set(["netifaces", "zbarlight", "kivent_core", "libzbar"]) +BROKEN_RECIPES = set(["netifaces", "kivent_core"]) # recipes that were already built will be skipped CORE_RECIPES = set(["kivy", "hostpython3", "python3"]) diff --git a/kivy_ios/recipes/zbarlight/__init__.py b/kivy_ios/recipes/zbarlight/__init__.py index d7be0296..7b5faec5 100755 --- a/kivy_ios/recipes/zbarlight/__init__.py +++ b/kivy_ios/recipes/zbarlight/__init__.py @@ -10,7 +10,7 @@ class ZbarLightRecipe(Recipe): version = "3.0" url = "https://github.com/Polyconseil/zbarlight/archive/{version}.tar.gz" - library = "zbarlight.a" + library = "libzbarlight.a" depends = ["hostpython3", "python3", "libzbar"] pbx_libraries = ["libz", "libbz2", "libc++", "libsqlite3"] pbx_frameworks = ["CoreMotion"] @@ -21,6 +21,7 @@ def get_zbar_env(self, plat): build_env["ARCH"] = plat.arch build_env["ARM_LD"] = build_env["LD"] build_env["LDSHARED"] = join(self.ctx.root_dir, "tools", "liblink") + build_env["PLATFORM_SDK"] = plat.sdk return build_env def build_platform(self, plat): @@ -53,7 +54,7 @@ def biglink(self): dirs.append(root) cmd = sh.Command(join(self.ctx.root_dir, "tools", "biglink")) - shprint(cmd, join(self.build_dir, "zbarlight.a"), *dirs) + shprint(cmd, join(self.build_dir, self.library), *dirs) recipe = ZbarLightRecipe()