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 V] Fix pycrypto #1546

Merged
merged 2 commits into from
Jan 15, 2019
Merged

[CORE UPDATE - PART V] Fix pycrypto #1546

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49346b
Fix openssl dependant recipe: pycrypto (and grants python3 compatibil…
opacam Dec 10, 2018
de4c4c5
Move libraries from LDFLAGS to LIBS for pycrypto recipe
opacam Jan 15, 2019
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
25 changes: 13 additions & 12 deletions pythonforandroid/recipes/pycrypto/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,27 @@
info,
shprint,
)
from os.path import join
import sh


class PyCryptoRecipe(CompiledComponentsPythonRecipe):
version = '2.6.1'
url = 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-{version}.tar.gz'
depends = ['openssl', 'python2']
version = '2.7a1'
url = 'https://github.com/dlitz/pycrypto/archive/v{version}.zip'
depends = ['openssl', ('python2', 'python3')]
site_packages_name = 'Crypto'

call_hostpython_via_targetpython = False
patches = ['add_length.patch']

def get_recipe_env(self, arch=None):
def get_recipe_env(self, arch=None, clang=True):
env = super(PyCryptoRecipe, self).get_recipe_env(arch)
openssl_build_dir = Recipe.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
env['CC'] = '%s -I%s' % (env['CC'], join(openssl_build_dir, 'include'))
env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
self.ctx.get_libs_dir(arch.arch) +
'-L{}'.format(self.ctx.libs_dir)) + ' -L{}'.format(
openssl_build_dir)
openssl_recipe = Recipe.get_recipe('openssl', self.ctx)
env['CC'] = env['CC'] + openssl_recipe.include_flags(arch)

env['LDFLAGS'] += ' -L{}'.format(self.ctx.get_libs_dir(arch.arch))
env['LDFLAGS'] += ' -L{}'.format(self.ctx.libs_dir)
env['LDFLAGS'] += openssl_recipe.link_dirs_flags(arch)
env['LIBS'] = env.get('LIBS', '') + openssl_recipe.link_libs_flags()

env['EXTRA_CFLAGS'] = '--host linux-armv'
env['ac_cv_func_malloc_0_nonnull'] = 'yes'
return env
Expand Down