X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=c3c14e5210e3366c43572fd7f5c8052ba2a739d0;hb=407859738ee6e1a518d25d2a54ee132b513a7089;hp=d677cc7b4c5492ce38c8078e19482b07182de87c;hpb=6be74141099e569e059115b9659f1a8c98306ac7;p=hvlinux.git diff --git a/functions/main b/functions/main index d677cc7..c3c14e5 100644 --- a/functions/main +++ b/functions/main @@ -752,6 +752,7 @@ ipkg_display_build_infos() echo " AR: ${AR}" echo " AS: ${AS}" echo " PATH: ${PATH}" + echo " HVMAKE: ${HVMAKE}" GCCCPUOPT=$(gcc ${MARCH_FLAGS} -E -v - &1 | \ sed -n 's/.* -v - //p') @@ -762,7 +763,7 @@ ipkg_display_build_infos() # Arg. #1: Package name and version (ex: gcc-4.5.1) # Remaining arguments: Additional configure options # Options: -# -h Display this help and returns +# -j Disable parallel make for this package # -l Unique identification label in 'install.log' # (default is package name and version) # -m Installation mode: @@ -781,8 +782,14 @@ ipkg() export IPKG_MODE="ac" # Default mode if not specified export HVLABEL="" # Global variable - while getopts "l:m:s:" flag ;do + local HVMAKE_ORIG=${HVMAKE} + + while getopts "jl:m:s:" flag ;do case ${flag} in + j) + # Disable parallel make onlyfor this package + HVMAKE="make" + ;; l) # Alternate label HVLABEL=${OPTARG} @@ -864,6 +871,9 @@ ipkg() source ${SCRDIR}/${DEFAULT_IPKG_SCRIPT} ipkg_script ${ALT_SCRIPT_NAME} + # Restore original value in case it was modified + HVMAKE=${HVMAKE_ORIG} + # Make sure we are at a known location cd ${SCRDIR}