Skip to content

Made the sdl2 bootstrap strip unneeded symbols with python3 #948

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
inclement merged 1 commit into from
Dec 4, 2016
Merged

Made the sdl2 bootstrap strip unneeded symbols with python3 #948

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
36 changes: 24 additions & 12 deletions pythonforandroid/recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,9 +737,7 @@ class PythonRecipe(Recipe):

def clean_build(self, arch=None):
super(PythonRecipe, self).clean_build(arch=arch)
name = self.site_packages_name
if name is None:
name = self.name
name = self.folder_name
python_install_dirs = glob.glob(join(self.ctx.python_installs_dir, '*'))
for python_install in python_install_dirs:
site_packages_dir = glob.glob(join(python_install, 'lib', 'python*',
Expand All @@ -766,6 +764,14 @@ def hostpython_location(self):
return self.real_hostpython_location
return self.ctx.hostpython

@property
def folder_name(self):
'''The name of the build folders containing this recipe.'''
name = self.site_packages_name
if name is None:
name = self.name
return name

def get_recipe_env(self, arch=None, with_flags_in_cc=True):
env = super(PythonRecipe, self).get_recipe_env(arch, with_flags_in_cc)
if not self.call_hostpython_via_targetpython:
Expand All @@ -782,10 +788,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
return env

def should_build(self, arch):
print('name is', self.site_packages_name, type(self))
name = self.site_packages_name
if name is None:
name = self.name
name = self.folder_name
if self.ctx.has_package(name):
info('Python package already exists in site-packages')
return False
Expand Down Expand Up @@ -1010,11 +1013,20 @@ def build_cython_components(self, arch):
info('First build appeared to complete correctly, skipping manual'
'cythonising.')

print('stripping')
build_lib = glob.glob('./build/lib*')
shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
env['STRIP'], '{}', ';', _env=env)
print('stripped!?')
if 'python2' in self.ctx.recipe_build_order:
info('Stripping object files')
build_lib = glob.glob('./build/lib*')
shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
env['STRIP'], '{}', ';', _env=env)

if 'python3crystax' in self.ctx.recipe_build_order:
info('Stripping object files')
shprint(sh.find, '.', '-iname', '*.so', '-exec',
'/usr/bin/echo', '{}', ';', _env=env)
shprint(sh.find, '.', '-iname', '*.so', '-exec',
env['STRIP'].split(' ')[0], '--strip-unneeded',
# '/usr/bin/strip', '--strip-unneeded',
'{}', ';', _env=env)

def cythonize_file(self, env, build_dir, filename):
short_filename = filename
Expand Down