[CORE UPDATE - PART IX] Pymunk for both versions of python and enhance flags (kivy#1550)

opacam · AndreMiras · commit ddb46f65bf93 · 2019-01-15T17:13:38.000+01:00
* Remove hardcoded python2 flags, shorten ldflags and grants python3 compatibility for the pymunk recipe

* Move libraries from LDFLAGS to LIBS for pymunk recipe

Because this is how you are supposed to do it, you must use LDFLAGS for linker flags and LDLIBS (or the equivalent LOADLIBES) for the libraries
diff --git a/pythonforandroid/recipes/pymunk/__init__.py b/pythonforandroid/recipes/pymunk/__init__.py
@@ -1,21 +1,21 @@
+from os.path import join
 from pythonforandroid.recipe import CompiledComponentsPythonRecipe
 
 
 class PymunkRecipe(CompiledComponentsPythonRecipe):
     name = "pymunk"
     version = '5.2.0'
     url = 'https://pypi.python.org/packages/5e/bd/e67edcffdee3d0a1e3ebf0050bb9746a61d616f5502ceedddf0f7fd0a896/pymunk-5.2.0.zip'
-    depends = [('python2', 'python3crystax'), 'cffi', 'setuptools']
+    depends = ['cffi', 'setuptools']
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch):
         env = super(PymunkRecipe, self).get_recipe_env(arch)
         env['PYTHON_ROOT'] = self.ctx.get_python_install_dir()
-        arch_noeabi = arch.arch.replace('eabi', '')
         env['LDFLAGS'] += " -shared -llog"
-        env['LDFLAGS'] += " -landroid -lpython2.7"
-        env['LDFLAGS'] += " --sysroot={ctx.ndk_dir}/platforms/android-{ctx.android_api}/arch-{arch_noeabi}".format(
-            ctx=self.ctx, arch_noeabi=arch_noeabi)
+        env['LDFLAGS'] += ' -L{}'.format(join(self.ctx.ndk_platform, 'usr', 'lib'))
+        env['LDFLAGS'] += " --sysroot={}".format(self.ctx.ndk_platform)
+        env['LIBS'] = env.get('LIBS', '') + ' -landroid'
         return env
 
 
