Skip to content

Commit

Permalink
Removed unnecessary recipe env setting in matplotlib recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
inclement committed May 21, 2019
1 parent e990f41 commit c597765
Showing 1 changed file with 1 addition and 25 deletions.
26 changes: 1 addition & 25 deletions pythonforandroid/recipes/matplotlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
version = '3.0.3'
url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'

depends = ['numpy', 'setuptools', 'freetype', 'kiwisolver']
depends = ['numpy', 'png', 'setuptools', 'freetype', 'kiwisolver']

python_depends = ['pyparsing', 'cycler', 'python-dateutil']

Expand All @@ -21,30 +21,6 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):

call_hostpython_via_targetpython = False

def get_recipe_env(self, arch):
env = super(MatplotlibRecipe, self).get_recipe_env(arch)

numpy_recipe = Recipe.get_recipe('numpy', self.ctx)

env['NUMPY_INCLUDE_DIR'] = join(
numpy_recipe.get_build_container_dir(arch.arch),
'numpy', 'core', 'include')

env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/freetype/include'.format(
jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))

freetype_so_dir = join(
Recipe.get_recipe('freetype', self.ctx).get_build_dir(arch),
'objs', '.libs'
)
env['CFLAGS'] += ' -L{}'.format(freetype_so_dir)
env['LDFLAGS'] += ' -L{}'.format(freetype_so_dir)

env['CFLAGS'] += ' -L/home/sandy/kivytest'
env['LDFLAGS'] += ' -L/home/sandy/kivytest'

return env

def prebuild_arch(self, arch):
with open(join(self.get_recipe_dir(), 'setup.cfg.template')) as fileh:
setup_cfg = fileh.read()
Expand Down

0 comments on commit c597765

Please sign in to comment.