Fix hardcoded "make -j5" and set it manually were needed

thopiekar · thopiekar · commit e7cea72eea23 · 2015-07-25T09:24:29.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -93,6 +93,11 @@ case $OSTYPE in
 		;;
 esac
 
+if [ -f /proc/cpuinfo ]; then
+	export MAKE_JOBS=($(grep -c ^processor /proc/cpuinfo) +1 )
+else
+	export MAKE_JOBS=1
+fi
 
 # Internals
 CRED="\x1b[31;01m"
@@ -214,7 +219,7 @@ function push_arm() {
 	export RANLIB="$TOOLCHAIN_PREFIX-ranlib"
 	export LD="$TOOLCHAIN_PREFIX-ld"
 	export STRIP="$TOOLCHAIN_PREFIX-strip --strip-unneeded"
-	export MAKE="make -j5"
+	export MAKE="make"
 	export READELF="$TOOLCHAIN_PREFIX-readelf"
 
 	# This will need to be updated to support Python versions other than 2.7
diff --git a/recipes/hostpython/recipe.sh b/recipes/hostpython/recipe.sh
@@ -25,7 +25,7 @@ function build_hostpython() {
 	cd $BUILD_hostpython
 
     try ./configure
-    try make -j5
+    try make -j$MAKE_JOBS 
     try mv Parser/pgen hostpgen
 
 	if [ -f python.exe ]; then
diff --git a/recipes/python/recipe.sh b/recipes/python/recipe.sh
@@ -102,7 +102,7 @@ function build_python() {
 
 	try ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --prefix="$BUILD_PATH/python-install" --enable-shared --disable-toolbox-glue --disable-framework
 	echo ./configure --host=$HOSTARCH --build=$BUILDARCH OPT=$OFLAG --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
+	echo $MAKE -j$MAKE_JOBS HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	cp HOSTPYTHON=$BUILD_python/hostpython python
 
 	# FIXME, the first time, we got a error at:
@@ -112,10 +112,10 @@ function build_python() {
 	# check if we can avoid this part.
 
 	debug 'First install (failing..)'
-	$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
+	$MAKE -j$MAKE_JOBS install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	debug 'Second install.'
 	touch python.exe python
-	$MAKE install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
+	$MAKE -j$MAKE_JOBS install HOSTPYTHON=$BUILD_python/hostpython HOSTPGEN=$BUILD_python/hostpgen CROSS_COMPILE_TARGET=yes INSTSONAME=libpython2.7.so
 	pop_arm
 
 	system=$(uname -s)
