More attempts to fix things, mostly useless

ZachGoldberg · ZachGoldberg · commit 3b64104ab353 · 2016-04-19T18:54:27.000-07:00
diff --git a/pythonforandroid/recipes/libxml2/__init__.py b/pythonforandroid/recipes/libxml2/__init__.py
@@ -17,12 +17,10 @@ def build_arch(self, arch):
         with current_directory(self.get_build_dir(arch.arch)):
             # If the build is done with /bin/sh things blow up,
             # try really hard to use bash
-            bash = sh.Command('/bin/bash')
             sed = sh.Command('sed')
-            make = sh.Command('make')
-            shprint(bash, 'configure', '--build=i686-pc-linux-gnu', '--host=arm-linux-eabi',
-                    '--without-modules',  '--without-legacy', '--without-history',  '--without-debug',  '--without-docbook', '--without-python', '--without-threads')
-            shprint(make, _env=env)
+            shprint(sh.Command('./configure'), '--build=i686-pc-linux-gnu', '--host=arm-linux-eabi',
+                    '--without-modules',  '--without-legacy', '--without-history',  '--without-debug',  '--without-docbook', '--without-python', '--without-threads', '--without-iconv')
+            shprint(sh.make, _env=env)
             shutil.copyfile('.libs/libxml2.a', join(self.ctx.get_libs_dir(arch.arch), 'libxml2.a'))
 
 
diff --git a/pythonforandroid/recipes/lxml/__init__.py b/pythonforandroid/recipes/lxml/__init__.py
@@ -1,11 +1,14 @@
 from pythonforandroid.toolchain import Recipe, shprint, shutil, current_directory
+from pythonforandroid.util import current_directory, ensure_dir
+from pythonforandroid.logger import debug, shprint, info
 from os.path import exists, join
 import sh
 
 class LXMLRecipe(Recipe):
     version = '3.6.0'
     url = 'https://pypi.python.org/packages/source/l/lxml/lxml-{version}.tar.gz'
     depends = ['python2', 'libxml2', 'libxslt']
+    name = 'lxml'
 
     def should_build(self, arch):
         super(LXMLRecipe, self).should_build(arch)
@@ -14,17 +17,29 @@ def should_build(self, arch):
 
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/png -I{jni_path}/jpeg'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/sdl/include -I{jni_path}/sdl_mixer'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        env['CFLAGS'] = env['CFLAGS'] + ' -I{jni_path}/sdl_ttf -I{jni_path}/sdl_image'.format(
+            jni_path=join(self.ctx.bootstrap.build_dir, 'jni'))
+        debug('pygame cflags', env['CFLAGS'])
+
+
+        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{libs_path} -L{src_path}/obj/local/{arch} -lm -lz'.format(
+            libs_path=self.ctx.libs_dir, src_path=self.ctx.bootstrap.build_dir, arch=env['ARCH'])
+
+        env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
+
         with current_directory(self.get_build_dir(arch.arch)):
+            info('hostpython is ' + self.ctx.hostpython)
             hostpython = sh.Command(self.ctx.hostpython)
-            shprint(hostpython,
-                    'setup.py',
+            shprint(hostpython, 'setup.py',
                     'build_ext',
-                    "-p%s" % arch.arch,
                     "-I/home/zgoldberg/.local/share/python-for-android/dists/peggo-python/python-install/include/python2.7/pyconfig.h",
                     "-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"
-
-            , _env=env)
+                    "-I/home/zgoldberg/.local/share/python-for-android/build/other_builds/libxslt/armeabi/libxslt",
+                    _tail=10000, _critical=True, _env=env)
 
         super(LXMLRecipe, self).build_arch(arch)
 
@@ -37,6 +52,16 @@ def get_recipe_env(self, arch):
         env['LDSHARED'] = "$LIBLINK"
         env['PATH'] += ":%s" % bxsl
         env['CFLAGS'] += ' -Os'
+        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(
+            self.ctx.get_libs_dir(arch.arch))
+        env['LDSHARED'] = join(self.ctx.root_dir, 'tools', 'liblink')
+        env['LIBLINK'] = 'NOTNONE'
+        env['NDKPLATFORM'] = self.ctx.ndk_platform
+
+        # Every recipe uses its own liblink path, object files are collected and biglinked later
+        liblink_path = join(self.get_build_container_dir(arch.arch), 'objects_{}'.format(self.name))
+        env['LIBLINK_PATH'] = liblink_path
+        ensure_dir(liblink_path)
         return env
 
 recipe = LXMLRecipe()
