Skip to content

Fixed libzqm recipe linking issues #1803

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

Merged
AndreMiras merged 4 commits into from
Apr 25, 2019
Merged

Fixed libzqm recipe linking issues #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9c7100
fixed crtbegin_so.o crtend_so.o link errors adding sysroot compiler o…
hpsaturn Apr 24, 2019
de784e5
fix tox syntax validation
hpsaturn Apr 25, 2019
54bd5df
fixed conversion to bytes on config str write
hpsaturn Apr 25, 2019
318a866
fixed concatenation string issue changed to format directive
hpsaturn Apr 25, 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
13 changes: 9 additions & 4 deletions pythonforandroid/recipes/libzmq/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@


class LibZMQRecipe(Recipe):
version = '4.1.4'
url = 'http://download.zeromq.org/zeromq-{version}.tar.gz'
version = '4.3.1'
url = 'https://github.com/zeromq/libzmq/releases/download/v{version}/zeromq-{version}.zip'
depends = []

def should_build(self, arch):
Expand All @@ -31,14 +31,14 @@ def build_arch(self, arch):
bash = sh.Command('sh')
shprint(
bash, './configure',
'--host=arm-linux-androideabi',
'--host={}'.format(arch.command_prefix),
'--without-documentation',
'--prefix={}'.format(prefix),
'--with-libsodium=no',
_env=env)
shprint(sh.make, _env=env)
shprint(sh.make, 'install', _env=env)
shutil.copyfile('.libs/libzmq.so', join(
shutil.copyfile('src/.libs/libzmq.so', join(
self.ctx.get_libs_dir(arch.arch), 'libzmq.so'))

bootstrap_obj_dir = join(self.ctx.bootstrap.build_dir, 'obj', 'local', arch.arch)
Expand All @@ -55,6 +55,9 @@ def build_arch(self, arch):
self.ctx.get_libs_dir(arch.arch)
)

def get_include_dirs(self, arch):
return [join(self.get_build_dir(arch.arch), 'include')]

def get_recipe_env(self, arch):
# XXX should stl be configuration for the toolchain itself?
env = super(LibZMQRecipe, self).get_recipe_env(arch)
Expand All @@ -69,6 +72,8 @@ def get_recipe_env(self, arch):
env['CXXFLAGS'] += ' -lgnustl_shared'
env['LDFLAGS'] += ' -L{}/sources/cxx-stl/gnu-libstdc++/{}/libs/{}'.format(
self.ctx.ndk_dir, self.ctx.toolchain_version, arch)
env['CXXFLAGS'] += ' --sysroot={}/platforms/android-{}/arch-arm'.format(
self.ctx.ndk_dir, self.ctx.ndk_api)
return env


Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/recipes/pyzmq/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def build_cython_components(self, arch):
[global]
zmq_prefix = {}
skip_check_zmq = True
""".format(libzmq_prefix))
""".format(libzmq_prefix).encode())

return super(PyZMQRecipe, self).build_cython_components(arch)

Expand Down