Changeset c205656 for optimize/optimize_functions

Timestamp:

05/08/2006 06:10:58 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

024e3de

Parents:

708a612

Message:

Applied optimization and makeflags patches from Jeremy Byron.
Renamed some files.

File:

• optimize/optimize_functions (modified) (4 diffs)

optimize/optimize_functions

@@ -12 +12 @@
 
   echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${MAKEFLAGS}${OFF}${R_arrow}\n"
-  echo -e "DEF_OPT_LVL: ${L_arrow}${BOLD}${DEF_OPT_LVL}${OFF}${R_arrow}\n"
+  echo -e "DEF_OPT_MODE: ${L_arrow}${BOLD}${DEF_OPT_MODE}${OFF}${R_arrow}\n"
 
   for OPT_VAR in $ACTIVE_OPT_VARS ; do
-    eval optVal=\$${OPT_VAR}_${DEF_OPT_LVL}
+    eval optVal=\$${OPT_VAR}_${DEF_OPT_MODE}
     echo -e "${OPT_VAR}: ${L_arrow}${BOLD}${optVal}${OFF}${R_arrow}"
   done
 
-  echo -e "\nOverrided packages:"
+  echo -e "\nOverridden packages:"
   cat optimize/opt_override
   echo "${nl_}${SD_BORDER}${nl_}"
@@ -36 +36 @@
 #----------------------------------#
   local pkg=$1
-  local optLvl optVal OPT_VAR
+  local optMode optVal OPT_VAR
 
-  optLvl=`awk -v pkg="$pkg" '$1 == pkg { print $2 }' $JHALFSDIR/opt_override`
-  if [[ "$optLvl" = "" ]] ; then
-    optLvl=$DEF_OPT_LVL;
+  optMode=`awk -v pkg="$pkg" '$1 == pkg { print $2 }' $JHALFSDIR/opt_override`
+  if [[ "$optMode" = "" ]] ; then
+    optMode=$DEF_OPT_MODE;
   fi
 
   for OPT_VAR in $ACTIVE_OPT_VARS ; do
-    eval optVal=\$${OPT_VAR}_$optLvl
+    eval optVal=\$${OPT_VAR}_$optMode
 
     if [[ "$optVal" != "unset" ]]; then
@@ -61 +61 @@
 wrt_makeflags() {                  # Apply MAKEFLAGS to build
 #----------------------------------#
-  if [[ "$MAKEFLAGS" != "unset" ]]; then
+  local pkg=$1
+
+  case $pkg in
+    gettext | groff ) # Don't support -jX for now
+      ;;
+    *)
+      if [[ "$MAKEFLAGS" != "unset" ]]; then
 (
 cat << EOF
@@ -67 +73 @@
 EOF
 ) >> $MKFILE.tmp
-  else
-    continue
-  fi
+      else
+        continue
+      fi
+      ;;
+  esac
 }