fix compilation of the sqlite3 extension + add a FAQ entry for it.

tito · tito · commit fe7c849be2d2 · 2012-09-28T18:48:22.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -623,6 +623,8 @@ while getopts ":hvlfxm:d:s" opt; do
 			list_modules
 			;;
 		s)
+			run_prepare
+			run_source_modules
 			push_arm
 			bash
 			pop_arm
diff --git a/docs/source/faq.rst b/docs/source/faq.rst
@@ -6,3 +6,20 @@ arm-linux-androideabi-gcc: Internal error: Killed (program cc1)
 
 This could happen if you are not using a validated SDK/NDK with Python for
 Android. Go to :doc:`prerequisites.rst` to see which one are working.
+
+_sqlite3.so not found
+---------------------
+
+We recently fixed sqlite3 compilation. In case of, you must:
+
+* Compile the distribution with (sqlite3 must be the first argument)::
+
+    ./distribute.sh -m 'sqlite3 kivy'
+
+* Go into your distribution at `dist/default`
+* Edit blacklist.txt, and remove all the lines concerning sqlite3::
+
+    sqlite3/*
+    lib-dynload/_sqlite3.so
+
+And then, sqlite3 will be compiled, and included in your APK.
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -63,6 +63,13 @@ function build_python() {
 		export LDFLAGS="$LDFLAGS -L$BUILD_openssl/"
 	fi
 
+	# sqlite3 activated ?
+	if [ "X$BUILD_sqlite3" != "X" ]; then
+		debug "Activate flags for sqlite3"
+		export CFLAGS="$CFLAGS -I$BUILD_sqlite3"
+		export LDFLAGS="$LDFLAGS -L$SRC_PATH/obj/local/$ARCH/"
+	fi
+
 	try ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo ./configure --host=arm-eabi --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo $MAKE HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
diff --git a/src/blacklist.txt b/src/blacklist.txt
@@ -76,6 +76,7 @@ os2emxpath.pyo
 multiprocessing/dummy*
 
 # unused binaries python modules
+lib-dynload/_sqlite3.so
 lib-dynload/termios.so
 lib-dynload/_lsprof.so
 lib-dynload/*audioop.so
