Libxml2 now builds successfully FOR ARM

ZachGoldberg · ZachGoldberg · commit 58636ba325c4 · 2016-04-20T22:14:00.000-07:00
diff --git a/pythonforandroid/recipes/libxml2/__init__.py b/pythonforandroid/recipes/libxml2/__init__.py
@@ -17,22 +17,14 @@ def build_arch(self, arch):
         super(Libxml2Recipe, self).build_arch(arch)
         env = self.get_recipe_env(arch)
         with current_directory(self.get_build_dir(arch.arch)):
-            # First we need to build glob.c because its not avail
-            # in android ndk
-
-
-            shprint(sh.Command(env['CC'].split(" ")[0]), env['CC'].split(" ")[1], "-c", "-I.", "glob.c")
-            shprint(sh.Command("chmod"), "+x", "glob.o")
-
-            env['LIBS'] = "./glob.o"
-
-            # If the build is done with /bin/sh things blow up,
-            # try really hard to use bash
-            sed = sh.Command('sed')
+            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',
                     _env=env)
-            shprint(sh.make, _env=env)
+
+            # Ensure we only build libxml2.la as if we do everything
+            # we'll need the glob dependency which is a big headache
+            shprint(sh.make, "libxml2.la", _env=env)
             shutil.copyfile('.libs/libxml2.a', join(self.ctx.get_libs_dir(arch.arch), 'libxml2.a'))
 
 
@@ -41,9 +33,6 @@ def get_recipe_env(self, 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['CCC'] = '/usr/bin/ccache arm-linux-androideabi-g++ -DANDROID -mandroid -fomit-frame-pointer'
-        #--sysroot /opt/android-sdks/ndk-bundle/platforms/android-16/arch-arm -I/home/zgoldberg/.local/share/python-for-android/build/other_builds/libxml2/armeabi/libxml2//include -I/home/zgoldberg/.local/share/python-for-android/build/other_builds/libxslt/armeabi/libxslt -I/home/zgoldberg/.local/share/python-for-android/build/python-installs/peggo-python/include/python2.7
-
         return env
 
 recipe = Libxml2Recipe()
