From f7cd5bbfe7f6be1c116ad81a9972799547acc895 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Wed, 20 Apr 2016 16:08:16 +0200 Subject: [PATCH 1/2] update m2crypto to 0.24.0 --- pythonforandroid/recipes/m2crypto/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/recipes/m2crypto/__init__.py b/pythonforandroid/recipes/m2crypto/__init__.py index fae2ca1464..b3f4dd1d5a 100644 --- a/pythonforandroid/recipes/m2crypto/__init__.py +++ b/pythonforandroid/recipes/m2crypto/__init__.py @@ -3,7 +3,7 @@ import sh class M2CryptoRecipe(PythonRecipe): - version = '0.23.0' + version = '0.24.0' url = 'https://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-{version}.tar.gz' #md5sum = '89557730e245294a6cab06de8ad4fb42' depends = ['openssl', 'hostpython2', 'python2', 'setuptools'] From 31fe43aea14f98ea1dd73e88601b39e5be754ac5 Mon Sep 17 00:00:00 2001 From: Paul Brussee Date: Mon, 25 Apr 2016 15:43:44 +0200 Subject: [PATCH 2/2] fix merged upstream in version 0.24.0 https://gitlab.com/m2crypto/m2crypto/merge_requests/50 --- pythonforandroid/recipes/m2crypto/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pythonforandroid/recipes/m2crypto/__init__.py b/pythonforandroid/recipes/m2crypto/__init__.py index b3f4dd1d5a..9c229d9719 100644 --- a/pythonforandroid/recipes/m2crypto/__init__.py +++ b/pythonforandroid/recipes/m2crypto/__init__.py @@ -13,8 +13,6 @@ class M2CryptoRecipe(PythonRecipe): def build_arch(self, arch): env = self.get_recipe_env(arch) with current_directory(self.get_build_dir(arch.arch)): - # Fix missing build dir - shprint(sh.mkdir, '-p', 'build/lib.' + 'linux-x86_64' + '-2.7/M2Crypto') # Build M2Crypto hostpython = sh.Command(self.hostpython_location) shprint(hostpython,