add openssl recipe

tito · tito · commit 6d6f15ce6ed6 · 2012-01-08T15:15:23.000+01:00
diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+VERSION_openssl=1.0.0e
+URL_openssl=http://www.openssl.org/source/openssl-$VERSION_openssl.tar.gz
+DEPS_openssl=()
+MD5_openssl=7040b89c4c58c7a1016c0dfa6e821c86
+BUILD_openssl=$BUILD_PATH/openssl/$(get_directory $URL_openssl)
+RECIPE_openssl=$RECIPES_PATH/openssl
+
+function prebuild_openssl() {
+	true
+}
+
+function build_openssl() {
+	cd $BUILD_openssl
+
+	if [ -f libssl.a ]; then
+		return
+	fi
+
+	push_arm
+
+	try ./Configure no-dso no-krb5 linux-armv4
+	try make build_libs
+
+	pop_arm
+}
+
+function postbuild_openssl() {
+	true
+}
diff --git a/recipes/python/patches/fix-setup-flags.patch b/recipes/python/patches/fix-setup-flags.patch
@@ -0,0 +1,16 @@
+--- Python-2.7.2/setup.py.orig	2012-01-08 15:10:39.867332119 +0100
++++ Python-2.7.2/setup.py	2012-01-08 15:10:45.723331911 +0100
+@@ -445,6 +445,13 @@
+                 '/lib', '/usr/lib',
+                 ]
+             inc_dirs += ['/usr/include']
++        else:
++            cflags = os.environ.get('CFLAGS')
++            if cflags:
++                inc_dirs += [x[2:] for x in cflags.split() if x.startswith('-I')]
++            ldflags = os.environ.get('LDFLAGS')
++            if ldflags:
++                lib_dirs += [x[2:] for x in ldflags.split() if x.startswith('-L')]
+         exts = []
+         missing = []
+ 
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -22,6 +22,7 @@ function prebuild_python() {
 	try patch -p1 < $RECIPE_python/patches/disable-modules.patch
 	try patch -p1 < $RECIPE_python/patches/fix-locale.patch
 	try patch -p1 < $RECIPE_python/patches/fix-gethostbyaddr.patch
+	try patch -p1 < $RECIPE_python/patches/fix-setup-flags.patch
 	try patch -p1 < $RECIPE_python/patches/custom-loader.patch
 	try patch -p1 < $RECIPE_python/patches/verbose-compilation.patch
 
@@ -34,9 +35,8 @@ function build_python() {
 	cd $BUILD_python
 
 	# if the last step have been done, avoid all
-	if [ -f $BUILD_PATH/python-install/bin/python.host ]; then
+	if [ -f libpython2.7.so ]; then
 		return
-		#true
 	fi
 	
 	# copy same module from host python
@@ -45,14 +45,18 @@ function build_python() {
 	try cp $BUILD_hostpython/hostpgen .
 
 	push_arm
+
+	# openssl activated ?
+	if [ "X$BUILD_openssl" != "X" ]; then
+		debug "Activate flags for openssl / python"
+		export CFLAGS="$CFLAGS -I$BUILD_openssl/include/"
+		export LDFLAGS="$LDFLAGS -L$BUILD_openssl/"
+	fi
+
 	try ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared
 	try $MAKE HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	cp HOSTPYTHON=$BUILD_python/hostpython python
 
-	# Try to compile module by ourself
-	#debug 'Try to compile module by ourself'
-	#$BUILD_python/hostpython -E setup.py build -v -f
-	
 	# FIXME, the first time, we got a error at:
 	# python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
     # /home/tito/code/python-for-android/build/python/Python-2.7.2/python: 1: Syntax error: word unexpected (expecting ")")
