fix pyopenssl as well (and fix bad patch on libxslt)

tito · tito · commit e9875e4a6543 · 2013-07-29T17:22:48.000+02:00
diff --git a/recipes/libxslt/recipe.sh b/recipes/libxslt/recipe.sh
@@ -8,11 +8,10 @@ BUILD_libxslt=$BUILD_PATH/libxslt/$(get_directory $URL_libxslt)
 RECIPE_libxslt=$RECIPES_PATH/libxslt
 
 function prebuild_libxslt() {
+	cd $BUILD_libxslt
 	if [ -f .patched ]; then
 		return
 	fi
-
-	cd $BUILD_libxslt
 	try patch -p1 < $RECIPE_libxslt/fix-dlopen.patch
 	touch .patched
 }
diff --git a/recipes/pyopenssl/fix-dlfcn.patch b/recipes/pyopenssl/fix-dlfcn.patch
@@ -0,0 +1,22 @@
+--- pyOpenSSL-0.13.orig/OpenSSL/__init__.py	2011-09-02 17:46:13.000000000 +0200
++++ pyOpenSSL-0.13/OpenSSL/__init__.py	2013-07-29 17:20:15.750079894 +0200
+@@ -12,6 +12,11 @@
+ except AttributeError:
+     from OpenSSL import crypto
+ else:
++    # XXX android fix
++    # linux: RTLD_NOW (0x2) | RTLD_GLOBAL (0x100 / 256)
++    # android: RTLD_NOW (0x0) | RTLD_GLOBAL (0x2)
++    flags = 0x2
++    '''
+     try:
+         import DLFCN
+     except ImportError:
+@@ -31,6 +36,7 @@
+     else:
+         flags = DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL
+         del DLFCN
++    '''
+ 
+     sys.setdlopenflags(flags)
+     from OpenSSL import crypto
diff --git a/recipes/pyopenssl/recipe.sh b/recipes/pyopenssl/recipe.sh
@@ -3,12 +3,18 @@
 VERSION_pyopenssl=0.13
 URL_pyopenssl=http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-$VERSION_pyopenssl.tar.gz
 DEPS_pyopenssl=(openssl python)
-MD5_pyopenssl= 767bca18a71178ca353dff9e10941929
+MD5_pyopenssl=767bca18a71178ca353dff9e10941929
 BUILD_pyopenssl=$BUILD_PATH/pyopenssl/$(get_directory $URL_pyopenssl)
 RECIPE_pyopenssl=$RECIPES_PATH/pyopenssl
 
 function prebuild_pyopenssl() {
-	true
+	cd $BUILD_pyopenssl
+	if [ -f .patched ]; then
+		return
+	fi
+
+	try patch -p1 < $RECIPE_pyopenssl/fix-dlfcn.patch
+	touch .patched
 }
 
 function build_pyopenssl() {
