recipes: add openssl optional recipe for ffmpeg and python

This commit is contained in:
Mathieu Virbel 2015-08-14 12:18:15 +02:00
parent a0e8b4af22
commit 7cb22bd0ec
3 changed files with 4 additions and 3 deletions

View file

@ -8,6 +8,7 @@ class FFMpegRecipe(Recipe):
url = "http://www.ffmpeg.org/releases/ffmpeg-{version}.tar.bz2" url = "http://www.ffmpeg.org/releases/ffmpeg-{version}.tar.bz2"
include_per_arch = True include_per_arch = True
include_dir = "dist/include" include_dir = "dist/include"
optional_depends = ["openssl"]
libraries = [ libraries = [
"libavcodec/libavcodec.a", "libavcodec/libavcodec.a",
"libavdevice/libavdevice.a", "libavdevice/libavdevice.a",

View file

@ -1,7 +1,6 @@
from toolchain import Recipe, shprint from toolchain import Recipe, shprint
from os.path import join, exists from os.path import join
import sh import sh
import os
arch_mapper = {'i386': 'darwin-i386-cc', arch_mapper = {'i386': 'darwin-i386-cc',

View file

@ -8,6 +8,7 @@ class PythonRecipe(Recipe):
version = "2.7.1" version = "2.7.1"
url = "https://www.python.org/ftp/python/{version}/Python-{version}.tar.bz2" url = "https://www.python.org/ftp/python/{version}/Python-{version}.tar.bz2"
depends = ["hostpython", "libffi", ] depends = ["hostpython", "libffi", ]
optional_depends = ["openssl"]
library = "libpython2.7.a" library = "libpython2.7.a"
pbx_libraries = ["libz", "libbz2", "libsqlite3"] pbx_libraries = ["libz", "libbz2", "libsqlite3"]
@ -31,7 +32,7 @@ class PythonRecipe(Recipe):
self.apply_patch("setuppath.patch") self.apply_patch("setuppath.patch")
self.append_file("ModulesSetup.mobile", "Modules/Setup.local") self.append_file("ModulesSetup.mobile", "Modules/Setup.local")
if "openssl.build_all" in self.ctx.state: 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") self.set_marker("patched")