Killing all hardcoded job options

thopiekar · thopiekar · commit c16db07640f2 · 2015-07-25T10:01:36.000+02:00
diff --git a/recipes/freetype/recipe.sh b/recipes/freetype/recipe.sh
@@ -18,7 +18,7 @@ function build_freetype() {
     push_arm
     export LDFLAGS="$LDFLAGS -L$BUILD_harfbuzz/src/.libs/"
     try ./configure --host=arm-linux-androideabi --prefix=$BUILD_freetype --without-zlib --with-png=no --enable-shared
-    try make -j5
+    try make -j$MAKE_JOBS
     pop_arm
 
     try cp $BUILD_freetype/objs/.libs/libfreetype.so $LIBS_PATH
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
@@ -27,7 +27,7 @@ function build_harfbuzz() {
     #try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --enable-shared --without-freetype --without-glib
     #~ try ./autogen.sh  --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
     try ./configure --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
-    try make -j5
+    try make -j$MAKE_JOBS
     pop_arm
     try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
 }
diff --git a/recipes/libtorrent/recipe.sh b/recipes/libtorrent/recipe.sh
@@ -28,8 +28,7 @@ function build_libtorrent() {
 	
 	# Build the Python bindings with Boost.Build and some dependencies recursively (libtorrent-rasterbar, Boost.*)
 	# Also link to openssl
-	# Hardcoded on -j5 because P4A does it too
-	$BOOST_ROOT/b2 -q -j5 target-os=android link=static boost-link=static boost=source threading=multi toolset=gcc-android geoip=off encryption=tommath linkflags="$BOOSTSTUFF" release
+	$BOOST_ROOT/b2 -q -j$MAKE_JOBS target-os=android link=static boost-link=static boost=source threading=multi toolset=gcc-android geoip=off encryption=tommath linkflags="$BOOSTSTUFF" release
 	
 	# Copy the module
 	try cp -L libtorrent.so $SITEPACKAGES_PATH
diff --git a/recipes/opencv/recipe.sh b/recipes/opencv/recipe.sh
@@ -45,7 +45,7 @@ function build_opencv() {
 	  -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=OFF \
 	  -DPYTHON_PACKAGES_PATH=$SITEPACKAGES_PATH \
 	  $_cvsrc
-	try make -j8 opencv_python
+	try make -j$MAKE_JOBS opencv_python
 	try cmake -DCOMPONENT=python -P ./cmake_install.cmake
 	try cp -a $_cvbuild/lib/$ARCH/lib*.so $LIBS_PATH
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function build_harfbuzz() {`
`27`	`27`	`#try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --enable-shared --without-freetype --without-glib`
`28`	`28`	`#~ try ./autogen.sh --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib`
`29`	`29`	`try ./configure --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib`
`30`		`- try make -j5`
	`30`	`+ try make -j$MAKE_JOBS`
`31`	`31`	`pop_arm`
`32`	`32`	`try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH`
`33`	`33`	`}`