@@ -9,7 +9,7 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
9
9
version = '3.0.3'
10
10
url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
11
11
12
- depends = ['numpy' , 'setuptools' , 'freetype' , 'kiwisolver' ]
12
+ depends = ['numpy' , 'png' , ' setuptools' , 'freetype' , 'kiwisolver' ]
13
13
14
14
python_depends = ['pyparsing' , 'cycler' , 'python-dateutil' ]
15
15
@@ -21,30 +21,6 @@ class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
21
21
22
22
call_hostpython_via_targetpython = False
23
23
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
-
48
24
def prebuild_arch (self , arch ):
49
25
with open (join (self .get_recipe_dir (), 'setup.cfg.template' )) as fileh :
50
26
setup_cfg = fileh .read ()
0 commit comments