From 7cb22bd0ece730ec23e34bc8a51375be09aca040 Mon Sep 17 00:00:00 2001 From: Mathieu Virbel Date: Fri, 14 Aug 2015 12:18:15 +0200 Subject: [PATCH] recipes: add openssl optional recipe for ffmpeg and python --- recipes/ffmpeg/__init__.py | 1 + recipes/openssl/__init__.py | 3 +-- recipes/python/__init__.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recipes/ffmpeg/__init__.py b/recipes/ffmpeg/__init__.py index 7a50a83..2452ce1 100644 --- a/recipes/ffmpeg/__init__.py +++ b/recipes/ffmpeg/__init__.py @@ -8,6 +8,7 @@ class FFMpegRecipe(Recipe): url = "http://www.ffmpeg.org/releases/ffmpeg-{version}.tar.bz2" include_per_arch = True include_dir = "dist/include" + optional_depends = ["openssl"] libraries = [ "libavcodec/libavcodec.a", "libavdevice/libavdevice.a", diff --git a/recipes/openssl/__init__.py b/recipes/openssl/__init__.py index 38a27f2..07b7cf2 100644 --- a/recipes/openssl/__init__.py +++ b/recipes/openssl/__init__.py @@ -1,7 +1,6 @@ from toolchain import Recipe, shprint -from os.path import join, exists +from os.path import join import sh -import os arch_mapper = {'i386': 'darwin-i386-cc', diff --git a/recipes/python/__init__.py b/recipes/python/__init__.py index a0111fd..f810523 100644 --- a/recipes/python/__init__.py +++ b/recipes/python/__init__.py @@ -8,6 +8,7 @@ class PythonRecipe(Recipe): version = "2.7.1" url = "https://www.python.org/ftp/python/{version}/Python-{version}.tar.bz2" depends = ["hostpython", "libffi", ] + optional_depends = ["openssl"] library = "libpython2.7.a" pbx_libraries = ["libz", "libbz2", "libsqlite3"] @@ -31,7 +32,7 @@ class PythonRecipe(Recipe): self.apply_patch("setuppath.patch") self.append_file("ModulesSetup.mobile", "Modules/Setup.local") if "openssl.build_all" in self.ctx.state: - self.append_file("ModulesSetup.openssl", 'Modules/Setup.local') + self.append_file("ModulesSetup.openssl", "Modules/Setup.local") self.set_marker("patched")