[WIP] Add correct CFLAGS to hostpython3 and -fPIC flag to avoid relocation error for few recipes

pythonforandroid/recipes/Pillow/__init__.py

@@ -45,6 +45,7 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         cflags += ' -I{}'.format(free_inc_dir)
         cflags += ' -I{}'.format(jpeg_inc_dir)
         cflags += ' -I{}'.format(ndk_include_dir)
+        cflags += ' -fPIC'
 
         env['LIBS'] = ' -lpng -lfreetype -lharfbuzz -ljpeg -lturbojpeg'
 

pythonforandroid/recipes/android/__init__.py

@@ -19,6 +19,12 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
     def get_recipe_env(self, arch):
         env = super().get_recipe_env(arch)
         env.update(self.config_env)
+
+        cflags = " -fPIC"
+
+        if cflags not in env["CFLAGS"]:
+            env["CFLAGS"] += cflags
+
         return env
 
     def prebuild_arch(self, arch):

pythonforandroid/recipes/hostpython3/__init__.py

@@ -1,3 +1,4 @@
+import os
 import sh
 
 from multiprocessing import cpu_count
@@ -81,6 +82,15 @@ def build_arch(self, arch):
         build_dir = join(recipe_build_dir, self.build_subdir)
         ensure_dir(build_dir)
 
+        # ... And add that dir into the include flags
+        env = os.environ
+        cppflags = f" -I{build_dir}"
+
+        try:
+            env["CPPFLAGS"] += cppflags
+        except KeyError:
+            env["CPPFLAGS"] = cppflags
+
         with current_directory(recipe_build_dir):
             # Configure the build
             with current_directory(build_dir):
@@ -101,7 +111,8 @@ def build_arch(self, arch):
                     raise BuildInterruptingException(
                         "Could not find Setup.dist or Setup in Python build")
 
-            shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir)
+            shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir,
+                    _env=env)
 
             # make a copy of the python executable giving it the name we want,
             # because we got different python's executable names depending on

pythonforandroid/recipes/kivy/__init__.py

@@ -49,6 +49,11 @@ def get_recipe_env(self, arch):
                 join(self.ctx.bootstrap.build_dir, 'jni', 'SDL2_ttf'),
                 ])
 
+        cflags = " -fPIC"
+
+        if cflags not in env["CFLAGS"]:
+            env["CFLAGS"] += cflags
+
         return env
 
 

pythonforandroid/recipes/pyjnius/__init__.py

@@ -17,6 +17,16 @@ class PyjniusRecipe(CythonRecipe):
     patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
                ('genericndkbuild_jnienv_getter.patch', will_build('genericndkbuild'))]
 
+    def get_recipe_env(self, arch=None, with_flags_in_cc=True):
+        env = super().get_recipe_env(arch, with_flags_in_cc)
+
+        cflags = " -fPIC"
+
+        if cflags not in env["CFLAGS"]:
+            env["CFLAGS"] += cflags
+
+        return env
+
     def postbuild_arch(self, arch):
         super().postbuild_arch(arch)
         info('Copying pyjnius java class to classes build dir')