skip biglink for jb 4.3

kived · kived · commit 19aa462701a1 · 2014-08-01T13:05:20.000-05:00
diff --git a/distribute.sh b/distribute.sh
@@ -63,6 +63,8 @@ export BIGLINK="$ROOT_PATH/src/tools/biglink"
 export PIP=$PIP_NAME
 export VIRTUALENV=$VIRTUALENV_NAME
 
+JELLYBEAN=0
+
 MD5SUM=$(which md5sum)
 if [ "X$MD5SUM" == "X" ]; then
 	MD5SUM=$(which md5)
@@ -218,6 +220,10 @@ function push_arm() {
 	export STRIP="$TOOLCHAIN_PREFIX-strip --strip-unneeded"
 	export MAKE="make -j5"
 
+	if [ "$JELLYBEAN" == "1" ]; then
+		export LIBLINK="$CC -shared $LDFLAGS"
+	fi
+
 	# Use ccache ?
 	which ccache &>/dev/null
 	if [ $? -eq 0 ]; then
@@ -248,6 +254,7 @@ function usage() {
 	echo
 	echo "  -d directory           Name of the distribution directory"
 	echo "  -h                     Show this help"
+	echo "  -j                     Create distribution for JB 4.3+"
 	echo "  -l                     Show a list of available modules"
 	echo "  -m 'mod1 mod2'         Modules to include"
 	echo "  -f                     Restart from scratch (remove the current build)"
@@ -345,6 +352,10 @@ function run_prepare() {
 		fi
 	done
 
+	if [ "$JELLYBEAN" == "1" ]; then
+		info "Distribution for Jelly Bean (4.3) or higher; biglink will be skipped"
+	fi
+
 	info "Distribution will be located at $DIST_PATH"
 	if [ -e "$DIST_PATH" ]; then
 		error "The distribution $DIST_PATH already exist"
@@ -760,7 +771,10 @@ function run_distribute() {
 	debug "Fill private directory"
 	try cp -a python-install/lib private/
 	try mkdir -p private/include/python2.7
-	try mv libs/$ARCH/libpymodules.so private/
+	
+	if [ "$JELLYBEAN" == "0" ]; then
+		try mv libs/$ARCH/libpymodules.so private/
+	fi
 	try cp python-install/include/python2.7/pyconfig.h private/include/python2.7/
 
 	debug "Reduce private directory from unwanted files"
@@ -786,9 +800,11 @@ function run_distribute() {
 }
 
 function run_biglink() {
-	push_arm
-	try $BIGLINK $LIBS_PATH/libpymodules.so $LIBLINK_PATH
-	pop_arm
+	if [ "$JELLYBEAN" == "0" ]; then
+		push_arm
+		try $BIGLINK $LIBS_PATH/libpymodules.so $LIBLINK_PATH
+		pop_arm
+	fi
 }
 
 function run() {
@@ -829,11 +845,14 @@ function arm_deduplicate() {
 
 
 # Do the build
-while getopts ":hvlfxm:u:d:s" opt; do
+while getopts ":hjvlfxm:u:d:s" opt; do
 	case $opt in
 		h)
 			usage
 			;;
+		j)
+			JELLYBEAN=1
+			;;
 		l)
 			list_modules
 			;;
