Skip to content

Commit 2b66842

Browse files
committed
Update M2Crypto recipe and grant python3 compatibility
Also remove unneeded flags because already set in base class
1 parent 8493d5e commit 2b66842

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pythonforandroid/recipes/m2crypto/__init__.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77

88
class M2CryptoRecipe(CompiledComponentsPythonRecipe):
9-
version = '0.24.0'
9+
version = '0.30.1'
1010
url = 'https://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-{version}.tar.gz'
11-
# md5sum = '89557730e245294a6cab06de8ad4fb42'
12-
depends = ['openssl', 'hostpython2', 'python2', 'setuptools']
11+
depends = [('python2', 'python3'), 'openssl', 'setuptools']
1312
site_packages_name = 'M2Crypto'
1413
call_hostpython_via_targetpython = False
1514

@@ -35,8 +34,6 @@ def build_compiled_components(self, arch):
3534
def get_recipe_env(self, arch):
3635
env = super(M2CryptoRecipe, self).get_recipe_env(arch)
3736
env['OPENSSL_BUILD_PATH'] = self.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
38-
# Set linker to use the correct gcc
39-
env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
4037
return env
4138

4239

0 commit comments

Comments
 (0)