From e62751e5074e7b76281cd94b157953d9cfd6226a Mon Sep 17 00:00:00 2001 From: opacam Date: Sun, 25 Aug 2019 14:52:53 +0200 Subject: [PATCH] [NDK19] Remove `--sysroot` from LDFLAGS for cffi and pymunk Because `--sysroot` flag is not needed anymore and make it fails the build since we migrated to new android's build system (implemented in NDK r19) See also: - https://developer.android.com/ndk/guides/other_build_systems --- pythonforandroid/recipes/cffi/__init__.py | 1 - pythonforandroid/recipes/pymunk/__init__.py | 1 - 2 files changed, 2 deletions(-) diff --git a/pythonforandroid/recipes/cffi/__init__.py b/pythonforandroid/recipes/cffi/__init__.py index 50458e55f6..aa291dca46 100644 --- a/pythonforandroid/recipes/cffi/__init__.py +++ b/pythonforandroid/recipes/cffi/__init__.py @@ -38,7 +38,6 @@ def get_recipe_env(self, arch=None): 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'] += " --sysroot={}".format(self.ctx.ndk_platform) env['PYTHONPATH'] = ':'.join([ self.ctx.get_site_packages_dir(), env['BUILDLIB_PATH'], diff --git a/pythonforandroid/recipes/pymunk/__init__.py b/pythonforandroid/recipes/pymunk/__init__.py index bb33b275a5..5f027ab0fb 100644 --- a/pythonforandroid/recipes/pymunk/__init__.py +++ b/pythonforandroid/recipes/pymunk/__init__.py @@ -14,7 +14,6 @@ def get_recipe_env(self, arch): env['PYTHON_ROOT'] = self.ctx.get_python_install_dir() env['LDFLAGS'] += " -shared -llog" 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