fix netifaces to correctly link and therefore detect the symbol for socket

tito · tito · commit 7df3a439770f · 2019-01-03T09:45:08.000+01:00
diff --git a/pythonforandroid/recipes/netifaces/__init__.py b/pythonforandroid/recipes/netifaces/__init__.py
@@ -1,6 +1,6 @@
+import os
 from pythonforandroid.recipe import CompiledComponentsPythonRecipe
 
-
 class NetifacesRecipe(CompiledComponentsPythonRecipe):
 
     version = '0.10.4'
@@ -16,11 +16,19 @@ class NetifacesRecipe(CompiledComponentsPythonRecipe):
     def get_recipe_env(self, arch):
         env = super(NetifacesRecipe, self).get_recipe_env(arch)
         env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
-        env['CFLAGS'] += ' -I' + env['PYTHON_ROOT'] + '/include/python2.7'
-        # Set linker to use the correct gcc
+        env['CFLAGS'] += ' -I{}'.format(self.ctx.python_recipe.include_root(arch.arch))
         env['LDSHARED'] = env['CC'] + ' -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions'
-        env['LDFLAGS'] += ' -L' + env['PYTHON_ROOT'] + '/lib' + \
-                          ' -lpython2.7'
+
+        # required for libc and libdl
+        ndk_dir = self.ctx.ndk_platform
+        ndk_lib_dir = os.path.join(ndk_dir, 'usr', 'lib')
+        env['LDFLAGS'] += ' -L{}'.format(ndk_lib_dir)
+        env['LDFLAGS'] += ' -L{}'.format(self.ctx.python_recipe.link_root(arch.arch))
+        env['LDFLAGS'] += ' -lpython{}'.format(self.ctx.python_recipe.major_minor_version_string)
+        if 'python3' in self.ctx.python_recipe.name:
+            env['LDFLAGS'] += 'm'
+        # XX very very bad, but in their setup, conftest doesn't use LDFLAGS?
+        env['CC'] += env['LDFLAGS']
         return env
 
 
