Gevent Crystax/Python3 support #1251
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Makes sure the arm cross linker is being used for LDSHARED. Fixes configure script complaining about CFLAGS and LDFLAGS and simplified `gevent.patch` (less is more), since flags are now sanitized during `get_recipe_env()` call. Also depends on kivy#1249 (symlink system Python to hostpython3crystax).
AndreMiras
commented
Apr 1, 2018
| def get_recipe_env(self, arch=None, with_flags_in_cc=True): | ||
| env = super(GeventRecipe, self).get_recipe_env(arch, with_flags_in_cc) | ||
| # sets linker to use the correct gcc (cross compiler) | ||
| env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions' |
There was a problem hiding this comment.
Otherwise the default host linker was picked up rather than the ARM cross compiler.
AndreMiras
commented
Apr 1, 2018
| @@ -15,7 +15,7 @@ diff -Naur gevent-1.1.1/setup.py gevent-1.1.1_diff/setup.py | |||
| ares_configure_command = ' '.join(["(cd ", _quoted_abspath('c-ares/'), | |||
| " && if [ -r ares_build.h ]; then cp ares_build.h ares_build.h.orig; fi ", | |||
| - " && /bin/sh ./configure " + _m32 + "CONFIG_COMMANDS= CONFIG_FILES= ", | |||
| + " && /bin/sh ./configure --host={} ".format(os.environ['TOOLCHAIN_PREFIX']) + "CFLAGS= LDFLAGS= CONFIG_COMMANDS= CONFIG_FILES= ", | |||
| + " && /bin/sh ./configure --host={} ".format(os.environ['TOOLCHAIN_PREFIX']) + "CONFIG_COMMANDS= CONFIG_FILES= ", | |||
There was a problem hiding this comment.
Sanitizing CFLAGS and LDFLAGS is now handled in get_recipe_env().
AndreMiras
commented
Apr 1, 2018
| env['LIBS'] = ' -lm' | ||
| if self.ctx.ndk == 'crystax': | ||
| env['LIBS'] += ' -lcrystax -lpython{}m'.format(self.ctx.python_recipe.version[0:3]) | ||
| env['LDSHARED'] += env['LIBS'] |
There was a problem hiding this comment.
So that we don't get run time cannot locate symbol errors.
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Makes sure the arm cross linker is being used for LDSHARED.
Fixes configure script complaining about CFLAGS and LDFLAGS and
simplified
gevent.patch(less is more), since flags are nowsanitized during
get_recipe_env()call.Also depends on #1249 (symlink system Python to hostpython3crystax).