Skip to content

Commit c597765

Browse files
committed
Removed unnecessary recipe env setting in matplotlib recipe
1 parent e990f41 commit c597765

File tree

1 file changed

+1
-25
lines changed

1 file changed

+1
-25
lines changed

pythonforandroid/recipes/matplotlib/__init__.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
99
version = '3.0.3'
1010
url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
1111

12-
depends = ['numpy', 'setuptools', 'freetype', 'kiwisolver']
12+
depends = ['numpy', 'png', 'setuptools', 'freetype', 'kiwisolver']
1313

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

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

2222
call_hostpython_via_targetpython = False
2323

24-
def get_recipe_env(self, arch):
25-
env = super(MatplotlibRecipe, self).get_recipe_env(arch)
26-
27-
numpy_recipe = Recipe.get_recipe('numpy', self.ctx)
28-
29-
env['NUMPY_INCLUDE_DIR'] = join(
30-
numpy_recipe.get_build_container_dir(arch.arch),
31-
'numpy', 'core', 'include')
32-
33-
env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/freetype/include'.format(
34-
jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
35-
36-
freetype_so_dir = join(
37-
Recipe.get_recipe('freetype', self.ctx).get_build_dir(arch),
38-
'objs', '.libs'
39-
)
40-
env['CFLAGS'] += ' -L{}'.format(freetype_so_dir)
41-
env['LDFLAGS'] += ' -L{}'.format(freetype_so_dir)
42-
43-
env['CFLAGS'] += ' -L/home/sandy/kivytest'
44-
env['LDFLAGS'] += ' -L/home/sandy/kivytest'
45-
46-
return env
47-
4824
def prebuild_arch(self, arch):
4925
with open(join(self.get_recipe_dir(), 'setup.cfg.template')) as fileh:
5026
setup_cfg = fileh.read()

0 commit comments

Comments
 (0)