[lxml] recipe fix

This patch fixes the recipes from PR
#1166.

Author: goffi-contrib

pythonforandroid/recipes/libxml2/__init__.py

@@ -18,7 +18,7 @@ def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             env['CC'] += " -I%s" % self.get_build_dir(arch.arch)
             shprint(sh.Command('./configure'),  '--host=arm-linux-eabi',
-                    '--without-modules',  '--without-legacy', '--without-hfinistory',  '--without-debug',  '--without-docbook', '--without-python', '--without-threads', '--without-iconv',
+                    '--without-modules',  '--without-legacy', '--without-history',  '--without-debug',  '--without-docbook', '--without-python', '--without-threads', '--without-iconv',
                     _env=env)
 
             # Ensure we only build libxml2.la as if we do everything
@@ -31,7 +31,7 @@ def get_recipe_env(self, arch):
         env = super(Libxml2Recipe, self).get_recipe_env(arch)
         env['CONFIG_SHELL'] = '/bin/bash'
         env['SHELL'] = '/bin/bash'
-        env['CC'] = '/usr/bin/ccache arm-linux-androideabi-gcc -DANDROID -mandroid -fomit-frame-pointer'
+        env['CC'] = 'arm-linux-androideabi-gcc -DANDROID -mandroid -fomit-frame-pointer --sysroot={}'.format(self.ctx.ndk_platform)
         return env
 
 recipe = Libxml2Recipe()

pythonforandroid/recipes/libxslt/__init__.py

@@ -1,5 +1,5 @@
 from pythonforandroid.toolchain import Recipe, shprint, shutil, current_directory
-from os.path import exists, join, dirname, basename
+from os.path import exists, join, dirname
 import sh
 
 class LibxsltRecipe(Recipe):
@@ -36,7 +36,8 @@ def get_recipe_env(self, arch):
         env = super(LibxsltRecipe, self).get_recipe_env(arch)
         env['CONFIG_SHELL'] = '/bin/bash'
         env['SHELL'] = '/bin/bash'
-        env['CC'] = '/usr/bin/ccache arm-linux-androideabi-gcc -DANDROID -mandroid -fomit-frame-pointer'
+        env['CC'] = 'arm-linux-androideabi-gcc -DANDROID -mandroid -fomit-frame-pointer --sysroot={}'.format(self.ctx.ndk_platform)
+
         env['LDSHARED'] = "%s -nostartfiles -shared -fPIC" % env['CC']
         return env
 

pythonforandroid/recipes/lxml/__init__.py

@@ -1,10 +1,6 @@
-from pythonforandroid.toolchain import Recipe, shprint, shutil, current_directory
-from pythonforandroid.toolchain import CompiledComponentsPythonRecipe
-from pythonforandroid.util import current_directory, ensure_dir
-from pythonforandroid.logger import debug, shprint, info
+from pythonforandroid.toolchain import Recipe, shutil
+from pythonforandroid.recipe import CompiledComponentsPythonRecipe
 from os.path import exists, join, dirname
-import sh
-import glob
 
 class LXMLRecipe(CompiledComponentsPythonRecipe):
     version = '3.6.0'
@@ -26,8 +22,8 @@ def build_arch(self, arch):
 
     def get_recipe_env(self, arch):
         env = super(LXMLRecipe, self).get_recipe_env(arch)
-        libxslt_recipe = Recipe.get_recipe('libxslt', self.ctx)
-        libxml2_recipe = Recipe.get_recipe('libxml2', self.ctx)
+        libxslt_recipe = Recipe.get_recipe('libxslt', self.ctx).get_build_dir(arch.arch)
+        libxml2_recipe = Recipe.get_recipe('libxml2', self.ctx).get_build_dir(arch.arch)
         targetpython = "%s/include/python2.7/" % dirname(dirname(self.ctx.hostpython))
         env['CC'] += " -I%s/include -I%s -I%s" % (libxml2_recipe, libxslt_recipe, targetpython)
         env['LDSHARED'] = '%s -nostartfiles -shared -fPIC -lpython2.7' % env['CC']