Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORE UPDATE - PART XI] M2crypto for both versions of python and updated version #1552

Merged
merged 1 commit into from
Jan 21, 2019
Merged

[CORE UPDATE - PART XI] M2crypto for both versions of python and updated version #1552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions pythonforandroid/recipes/m2crypto/__init__.py
View file
Open in desktop
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