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.

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

[WIP][CORE UPDATE - PART XIV] Libtorrent+boost for both versions of python and updated versions #1555

Merged
merged 1 commit into from
Jan 30, 2019

Conversation

opacam
Copy link
Member

@opacam opacam commented Dec 22, 2018

This is one more part for the pr #1537 (discussed previously in #1460 and #1534)

Grants compatibility for both versions of python, maintaining the same build method (android's ndk standalone toolchain and b2 tool) but now we will use clang as the compiler, plus starts the migration of the stl lib from gnustl_shared to c++_shared (the only one stl lib starting from ndk18)

Note: this has to be merged only when the core-update has been merged because it has been tested with the new python core and depends on the new openssl lib version 1.1 introduced in #1537

@inclement
Copy link
Member

Looks good to me. @opacam would you mind rebasing one last time to resolve the conflicts? Otherwise I can do it and get someone else to merge it.

The failing test is only because the log gets too long for travis.

…tibility)

Since the openssl and ndk update the boost and libtorrent recipes weren't working. The old version for boost libraries does not support openssl 1.1, so we must update it. The old libtorrent recipe is strongly dependant on boost so we also update it. Also, before this commit, the compiler used to make those builds were gcc, now we use clang (the default compiler for the latest android ndk).

Note: Those recipes were tested for both python versions with a slight modification of the test apps and importing the libtorrent at runtime without problems, plus the generated libraries are linked with our versions of openssl and python (using the readelf command)
@opacam opacam force-pushed the python-core-libtorrent branch from fea6e72 to f551a85 Compare January 30, 2019 13:47
@opacam
Copy link
Member Author

opacam commented Jan 30, 2019

Done @inclement

Copy link
Member

@inclement inclement left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just waiting for travis :)

Edit: Travis is failing for reasons of download flakiness, I won't let it block the merge but will give a little time for it to recover.

@inclement inclement merged commit 29f3494 into kivy:master Jan 30, 2019
@inclement
Copy link
Member

Merged even though the tests aren't working, as they seem to fail repeatedly due to issues with downloading the SDK or its components. The tests passed before, and the PR doesn't touch any recipes that are actually in the tests, so it should be fine.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants