add the ability to customize the blacklist in postbuild_*. use it in sqlite3 to remove some part of the blacklist using sed + block strip

tito · tito · commit 419a22dc2a7c · 2013-10-30T01:03:03.000+01:00
diff --git a/distribute.sh b/distribute.sh
@@ -343,6 +343,9 @@ function run_prepare() {
 	echo "target=android-$ANDROIDAPI" > $SRC_PATH/default.properties
 	echo "sdk.dir=$ANDROIDSDK" > $SRC_PATH/local.properties
 
+	# copy the initial blacklist in build
+	try cp -a $SRC_PATH/blacklist.txt $BUILD_PATH
+
 	# check arm env
 	push_arm
 	debug "PATH is $PATH"
@@ -650,7 +653,7 @@ function run_distribute() {
 	try cp -a $SRC_PATH/src .
 	try cp -a $SRC_PATH/templates .
 	try cp -a $SRC_PATH/res .
-	try cp -a $SRC_PATH/blacklist.txt .
+	try cp -a $BUILD_PATH/blacklist.txt .
 
 	debug "Copy python distribution"
 	$BUILD_PATH/python-install/bin/python.host -OO -m compileall $BUILD_PATH/python-install
diff --git a/recipes/sqlite3/recipe.sh b/recipes/sqlite3/recipe.sh
@@ -18,5 +18,6 @@ function build_sqlite3() {
 }
 
 function postbuild_sqlite3() {
-	true
+	# ensure the blacklist doesn't contain sqlite3
+	$SED '/#>sqlite3/,/#<sqlite3/d' $BUILD_PATH/blacklist.txt
 }
diff --git a/src/blacklist.txt b/src/blacklist.txt
@@ -57,7 +57,6 @@ encodings/hz*
 # unused python modules
 bsddb/*
 wsgiref/*
-sqlite3/*
 hotshot/*
 pydoc_data/*
 tty.pyo
@@ -76,7 +75,6 @@ os2emxpath.pyo
 multiprocessing/dummy*
 
 # unused binaries python modules
-lib-dynload/_sqlite3.so
 lib-dynload/termios.so
 lib-dynload/_lsprof.so
 lib-dynload/*audioop.so
@@ -92,3 +90,10 @@ lib-dynload/pyexpat.so
 
 # odd files
 plat-linux3/regen
+
+#>sqlite3
+# conditionnal include depending if some recipes are included or not.
+sqlite3/*
+lib-dynload/_sqlite3.so
+#<sqlite3
+

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,6 @@ function build_sqlite3() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`function postbuild_sqlite3() {`
`21`		`- true`
	`21`	`+ # ensure the blacklist doesn't contain sqlite3`
	`22`	`+ $SED '/#>sqlite3/,/#<sqlite3/d' $BUILD_PATH/blacklist.txt`
`22`	`23`	`}`