From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 10 Mar 2011 21:17:48 +0000 (+0000)
Subject: Ajout support option -j pour desactiver parallel make pour certains packages
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=407859738ee6e1a518d25d2a54ee132b513a7089;p=hvlinux.git

Ajout support option -j pour desactiver parallel make pour certains packages
---

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 - </dev/null 2>&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}
 
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 4c090db..f26a298 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -20,7 +20,7 @@ ipkg -m noac ${PCIUTILS}
 ipkg -m acnb ${LIBUSB}
 ipkg ${LIBUSB_COMPAT}
 ipkg ${USBUTILS}
-ipkg ${FCRON}
+ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
@@ -29,7 +29,7 @@ ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
 ipkg ${SQLITE}
-ipkg ${SUBVERSION} "--without-berkeley-db"
+ipkg -j ${SUBVERSION} "--without-berkeley-db"
 ipkg ${SUDO}
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \