Merge pull request kivy#863 from chaubold/fix-libzmq-recipe

inclement · web-flow · commit 2128dab7992a · 2016-08-31T22:15:18.000+01:00
libzmq recipe: do not hardcode g++ version
diff --git a/pythonforandroid/recipes/libzmq/__init__.py b/pythonforandroid/recipes/libzmq/__init__.py
@@ -44,23 +44,24 @@ def build_arch(self, arch):
             bootstrap_obj_dir = join(self.ctx.bootstrap.build_dir, 'obj', 'local', arch.arch)
             ensure_dir(bootstrap_obj_dir)
             shutil.copyfile(
-                '{}/sources/cxx-stl/gnu-libstdc++/4.8/libs/{}/libgnustl_shared.so'.format(
-                    self.ctx.ndk_dir, arch),
+                '{}/sources/cxx-stl/gnu-libstdc++/{}/libs/{}/libgnustl_shared.so'.format(
+                    self.ctx.ndk_dir, self.ctx.toolchain_version, arch),
                 join(bootstrap_obj_dir, 'libgnustl_shared.so'))
 
     def get_recipe_env(self, arch):
         # XXX should stl be configuration for the toolchain itself?
         env = super(LibZMQRecipe, self).get_recipe_env(arch)
         env['CFLAGS'] += ' -Os'
         env['CXXFLAGS'] += ' -Os -fPIC -fvisibility=default'
-        env['CXXFLAGS'] += ' -I{}/sources/cxx-stl/gnu-libstdc++/4.8/include'.format(self.ctx.ndk_dir)
-        env['CXXFLAGS'] += ' -I{}/sources/cxx-stl/gnu-libstdc++/4.8/libs/{}/include'.format(
-            self.ctx.ndk_dir, arch)
-        env['CXXFLAGS'] += ' -L{}/sources/cxx-stl/gnu-libstdc++/4.8/libs/{}'.format(
-            self.ctx.ndk_dir, arch)
+        env['CXXFLAGS'] += ' -I{}/sources/cxx-stl/gnu-libstdc++/{}/include'.format(
+            self.ctx.ndk_dir, self.ctx.toolchain_version)
+        env['CXXFLAGS'] += ' -I{}/sources/cxx-stl/gnu-libstdc++/{}/libs/{}/include'.format(
+            self.ctx.ndk_dir, self.ctx.toolchain_version, arch)
+        env['CXXFLAGS'] += ' -L{}/sources/cxx-stl/gnu-libstdc++/{}/libs/{}'.format(
+            self.ctx.ndk_dir, self.ctx.toolchain_version, arch)
         env['CXXFLAGS'] += ' -lgnustl_shared'
-        env['LDFLAGS'] += ' -L{}/sources/cxx-stl/gnu-libstdc++/4.8/libs/{}'.format(
-            self.ctx.ndk_dir, arch)
+        env['LDFLAGS'] += ' -L{}/sources/cxx-stl/gnu-libstdc++/{}/libs/{}'.format(
+            self.ctx.ndk_dir, self.ctx.toolchain_version, arch)
         return env
 
 
