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

tito · tito · commit ee52b389da5f · 2013-06-24T13:51:02.000+02:00
diff --git a/recipes/python/patches/_scproxy.py b/recipes/python/patches/_scproxy.py
@@ -0,0 +1,10 @@
+'''
+Stub functions for _scproxy on iOS
+No proxy is supported yet.
+'''
+
+def _get_proxy_settings():
+    return {'exclude_simple': 1}
+
+def _get_proxies():
+    return {}
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -88,6 +88,10 @@ function build_python() {
 	$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	pop_arm
 
+	system=$(uname -s)
+	if [ "X$system" == "XDarwin" ]; then
+		try cp $RECIPE_python/patches/_scproxy.py $BUILD_python/Lib/
+	fi
 	try cp $BUILD_hostpython/hostpython $BUILD_PATH/python-install/bin/python.host
 	try cp libpython2.7.so $LIBS_PATH/
 }
