projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ajout support option -j pour desactiver parallel make pour certains packages
[hvlinux.git]
/
functions
/
main
diff --git
a/functions/main
b/functions/main
index
d677cc7
..
c3c14e5
100644
(file)
--- a/
functions/main
+++ b/
functions/main
@@
-752,6
+752,7
@@
ipkg_display_build_infos()
echo " AR: ${AR}"
echo " AS: ${AS}"
echo " PATH: ${PATH}"
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')
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:
# 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:
# -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
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
case ${flag} in
+ j)
+ # Disable parallel make onlyfor this package
+ HVMAKE="make"
+ ;;
l)
# Alternate label
HVLABEL=${OPTARG}
l)
# Alternate label
HVLABEL=${OPTARG}
@@
-864,6
+871,9
@@
ipkg()
source ${SCRDIR}/${DEFAULT_IPKG_SCRIPT}
ipkg_script ${ALT_SCRIPT_NAME}
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}
# Make sure we are at a known location
cd ${SCRDIR}