Merge branch 'master' of github.com:kivy/python-for-android

inclement · inclement · commit 64e6fa9fee3d · 2016-05-07T22:41:16.000+01:00
diff --git a/pythonforandroid/archs.py b/pythonforandroid/archs.py
@@ -111,7 +111,7 @@ def get_env(self, with_flags_in_cc=True):
 
         env['ARCH'] = self.arch
 
-        if self.ctx.python_recipe.from_crystax:
+        if self.ctx.python_recipe and self.ctx.python_recipe.from_crystax:
             env['CRYSTAX_PYTHON_VERSION'] = self.ctx.python_recipe.version
 
         return env
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -564,7 +564,7 @@ def build_recipes(build_order, python_modules, ctx):
         # 4) biglink everything
         # AND: Should make this optional
         info_main('# Biglinking object files')
-        if not ctx.python_recipe.from_crystax:
+        if not ctx.python_recipe or not ctx.python_recipe.from_crystax:
             biglink(ctx, arch)
         else:
             info('NDK is crystax, skipping biglink (will this work?)')
diff --git a/pythonforandroid/recipes/ipaddress/__init__.py b/pythonforandroid/recipes/ipaddress/__init__.py
@@ -3,7 +3,7 @@
 
 class IpaddressRecipe(PythonRecipe):
 	name = 'ipaddress'
-	version = '1.0.15'
+	version = '1.0.16'
 	url = 'https://pypi.python.org/packages/source/i/ipaddress/ipaddress-{version}.tar.gz'
 
 	depends = ['python2']
diff --git a/pythonforandroid/recipes/libtribler/__init__.py b/pythonforandroid/recipes/libtribler/__init__.py
@@ -0,0 +1,22 @@
+from pythonforandroid.toolchain import PythonRecipe
+
+"""
+Privacy with BitTorrent and resilient to shut down
+
+http://www.tribler.org
+"""
+class LibTriblerRecipe(PythonRecipe):
+
+    version = 'devel'
+
+    url = 'git+https://github.com/Tribler/tribler.git'
+
+    depends = ['apsw', 'cherrypy', 'cryptography', 'decorator', 'feedparser',
+               'ffmpeg', 'libnacl', 'libsodium', 'libtorrent', 'm2crypto',
+               'netifaces', 'openssl', 'pyasn1', 'pil', 'pycrypto', 'pyleveldb',
+               'python2', 'requests', 'twisted']
+
+    site_packages_name = 'Tribler'
+
+
+recipe = LibTriblerRecipe()
