10000 Merge branch 'master' of github.com:kivy/python-for-android · onioman/python-for-android@ee52b38 · GitHub
[go: up one dir, main page]
Skip to content

Commit ee52b38

Browse files
titotito
committed
Merge branch 'master' of github.com:kivy/python-for-android
2 parents 3486922 + 70e49ad commit ee52b38

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

‎recipes/python/patches/_scproxy.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
'''
2+
Stub functions for _scproxy on iOS
3+
No proxy is supported yet.
4+
'''
5+
6+
def _get_proxy_settings():
7+
return {'exclude_simple': 1}
8+
9+
def _get_proxies():
10+
return {}

‎recipes/python/recipe.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ function build_python() {
8888
$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
8989
pop_arm
9090

91+
system=$(uname -s)
92+
if [ "X$system" == "XDarwin" ]; then
93+
try cp $RECIPE_python/patches/_scproxy.py $BUILD_python/Lib/
94+
fi
9195
try cp $BUILD_hostpython/hostpython $BUILD_PATH/python-install/bin/python.host
9296
try cp libpython2.7.so $LIBS_PATH/
9397
}

0 commit comments

Comments
 (0)
0