Merge pull request kivy#398 from torfinnberset/master

tito · tito · commit 9feb0af21f29 · 2015-06-30T21:08:17.000+02:00
Updated Twisted and Zope recipes
diff --git a/recipes/thrift/recipe.sh b/recipes/thrift/recipe.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+VERSION_thrift=${VERSION_thrift:-0.9.2}
+URL_thrift=https://pypi.python.org/packages/source/t/thrift/thrift-$VERSION_thrift.tar.gz
+DEPS_thrift=(python setuptools)
+MD5_thrift=91f1c224c46a257bb428431943387dfd
+BUILD_thrift=$BUILD_PATH/thrift/$(get_directory $URL_thrift)
+RECIPE_thrift=$RECIPES_PATH/thrift
+
+function prebuild_thrift() {
+    true
+}
+
+function shouldbuild_thrift() {
+    if [ -d "$SITEPACKAGES_PATH/thrift" ]; then
+		DO_BUILD=0
+    fi
+}
+
+function build_thrift() {
+    cd $BUILD_thrift
+
+    push_arm
+
+    # fake try to be able to cythonize generated files
+    $HOSTPYTHON setup.py build_ext
+    try find . -iname '*.pyx' -exec $CYTHON {} \;
+    try $HOSTPYTHON setup.py build_ext -v
+
+    try find build/lib.* -name "*.o" -exec $STRIP {} \;
+
+    export PYTHONPATH=$BUILD_PATH/hostpython/Python-2.7.2/Lib/site-packages
+    try $BUILD_PATH/hostpython/Python-2.7.2/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
+
+    pop_arm
+}
+
+function postbuild_thrift() {
+    true
+}
diff --git a/recipes/twisted/recipe.sh b/recipes/twisted/recipe.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-VERSION_twisted=${VERSION_twisted:-14.0}
-URL_twisted=http://twistedmatrix.com/Releases/Twisted/$VERSION_twisted/Twisted-$VERSION_twisted.0.tar.bz2
+VERSION_twisted=${VERSION_twisted:-15.2}
+URL_twisted=http://twistedmatrix.com/Releases/Twisted/$VERSION_twisted/Twisted-$VERSION_twisted.1.tar.bz2
 
 DEPS_twisted=(zope)
-MD5_twisted=9625c094e0a18da77faa4627b98c9815
+MD5_twisted=4be066a899c714e18af1ecfcb01cfef7
 BUILD_twisted=$BUILD_PATH/twisted/$(get_directory $URL_twisted)
 RECIPE_twisted=$RECIPES_PATH/twisted
 
