Skip to content

Commit

Permalink
Merge pull request #1552 from opacam/python-core-m2crypto
Browse files Browse the repository at this point in the history
[CORE UPDATE - PART XI] M2crypto for both versions of python and updated version
  • Loading branch information
AndreMiras authored Jan 21, 2019
2 parents 736a55c + 2b66842 commit 178d552
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions pythonforandroid/recipes/m2crypto/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@


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

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


Expand Down

0 comments on commit 178d552

Please sign in to comment.