From 26a76b65e5cbfda727936bb5406d03ad1007d11e Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Fri, 14 Oct 2016 17:59:39 +0200 Subject: [PATCH] recipe dependencies --- recipes/cffi/__init__.py | 8 +++++++- recipes/cryptography/__init__.py | 12 ++++++------ recipes/enum34/__init__.py | 2 +- recipes/idna/__init__.py | 2 +- recipes/ipaddress/__init__.py | 2 +- recipes/pyasn1/__init__.py | 2 +- recipes/pyopenssl/__init__.py | 2 +- recipes/txaio/__init__.py | 2 +- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/recipes/cffi/__init__.py b/recipes/cffi/__init__.py index 7b06d26..536c1a7 100644 --- a/recipes/cffi/__init__.py +++ b/recipes/cffi/__init__.py @@ -9,7 +9,13 @@ class CffiRecipe(CythonRecipe): "686af8873b70028fccf67b15c78fd4e4667a3da995007afc71e786d61b0a/" "cffi-{version}.tar.gz" ) - depends = ["libffi", "pycparser"] + depends = ["libffi", "host_setuptools", "pycparser"] cythonize = False + def get_recipe_env(self, arch): + env = super(CffiRecipe, self).get_recipe_env(arch) + env["CC"] += " -I{}".format( + join(self.ctx.dist_dir, "include", arch.arch, "libffi")) + return env + recipe = CffiRecipe() diff --git a/recipes/cryptography/__init__.py b/recipes/cryptography/__init__.py index 8182e7e..fa3813d 100644 --- a/recipes/cryptography/__init__.py +++ b/recipes/cryptography/__init__.py @@ -10,13 +10,13 @@ class CryptographyRecipe(CythonRecipe): "60984cb85cc38c4ebdfca27b32a6df6f1914959d8790f5a349608c78be61/" "cryptography-{version}.tar.gz" ) - depends = ["host_setuptools", "six", "idna", "pyasn1"] + depends = ["host_setuptools", "cffi", "six", "idna", "pyasn1", "enum34"] cythonize = False - def get_recipe_env(self, arch): - env = super(CryptographyRecipe, self).get_recipe_env(arch) - env["CC"] += " -I{}".format( - join(self.ctx.dist_dir, "include", arch.arch, "libffi")) - return env + #def get_recipe_env(self, arch): + # env = super(CryptographyRecipe, self).get_recipe_env(arch) + # env["CC"] += " -I{}".format( + # join(self.ctx.dist_dir, "include", arch.arch, "libffi")) + # return env recipe = CryptographyRecipe() diff --git a/recipes/enum34/__init__.py b/recipes/enum34/__init__.py index 28f2d1b..6802097 100644 --- a/recipes/enum34/__init__.py +++ b/recipes/enum34/__init__.py @@ -12,7 +12,7 @@ class Enum34Recipe(PythonRecipe): "31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/" "enum34-{version}.tar.gz" ) - depends = ["python"] + depends = ["python", "host_setuptools"] def install(self): arch = list(self.filtered_archs)[0] diff --git a/recipes/idna/__init__.py b/recipes/idna/__init__.py index 5ff50f8..3260bf8 100644 --- a/recipes/idna/__init__.py +++ b/recipes/idna/__init__.py @@ -12,7 +12,7 @@ class IdnaRecipe(PythonRecipe): "8c27516fbaa8147acd2e431086b473c453c428e24e8fb99a1d89ce381851/" "idna-{version}.tar.gz" ) - depends = ["python"] + depends = ["python", "host_setuptools"] def install(self): arch = list(self.filtered_archs)[0] diff --git a/recipes/ipaddress/__init__.py b/recipes/ipaddress/__init__.py index 367b922..c336784 100644 --- a/recipes/ipaddress/__init__.py +++ b/recipes/ipaddress/__init__.py @@ -12,7 +12,7 @@ class IPAddressRecipe(PythonRecipe): "3b64955ff73f9e3155079b9ed31812afdfa5333b5c76387454d651ef593a/" "ipaddress-{version}.tar.gz" ) - depends = ["python"] + depends = ["python", "host_setuptools"] def install(self): arch = list(self.filtered_archs)[0] diff --git a/recipes/pyasn1/__init__.py b/recipes/pyasn1/__init__.py index f652e14..98f88c1 100644 --- a/recipes/pyasn1/__init__.py +++ b/recipes/pyasn1/__init__.py @@ -12,7 +12,7 @@ class Pyasn1Recipe(PythonRecipe): "377e3dd2e95f9020dbd0dfd3c47aaa7deebe3c68d3857a4e51917146ae8b/" "pyasn1-{version}.tar.gz" ) - depends = ["python"] + depends = ["ipaddress"] def install(self): arch = list(self.filtered_archs)[0] diff --git a/recipes/pyopenssl/__init__.py b/recipes/pyopenssl/__init__.py index 4f2ca49..c13c3d6 100644 --- a/recipes/pyopenssl/__init__.py +++ b/recipes/pyopenssl/__init__.py @@ -12,7 +12,7 @@ class PyOpenSSLRecipe(PythonRecipe): "79c75db50e57350a7cefb70b110255757e9abd380a50ebdc0cfd853b7450/" "pyOpenSSL-{version}.tar.gz" ) - depends = ["openssl", "six", "cryptography"] + depends = ["openssl", "cryptography"] def install(self): arch = list(self.filtered_archs)[0] diff --git a/recipes/txaio/__init__.py b/recipes/txaio/__init__.py index 22646e0..8d3d992 100644 --- a/recipes/txaio/__init__.py +++ b/recipes/txaio/__init__.py @@ -12,7 +12,7 @@ class TxaioRecipe(PythonRecipe): "f7d88767d65dbfc20d4b4aa0dad657dbbe8ca629ead2bef24da04630a12a/" "txaio-{version}.tar.gz" ) - depends = ["six"] + depends = ["host_setuptools", "six"] def install(self): arch = list(self.filtered_archs)[0]