r2664 - in jhalfs/branches/experimental: CLFS HLFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun May 7 07:56:42 PDT 2006


Author: manuel
Date: 2006-05-07 08:56:41 -0600 (Sun, 07 May 2006)
New Revision: 2664

Modified:
   jhalfs/branches/experimental/CLFS/master.sh
   jhalfs/branches/experimental/HLFS/master.sh
Log:
Added optimize support to CLFS and HLFS.

Modified: jhalfs/branches/experimental/CLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS/master.sh	2006-05-07 14:27:20 UTC (rev 2663)
+++ jhalfs/branches/experimental/CLFS/master.sh	2006-05-07 14:56:41 UTC (rev 2664)
@@ -184,6 +184,7 @@
     # Insert instructions for unpacking the package and to set the PKGDIR variable.
     #
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_su "${this_script}" "${file}"
     #
@@ -255,6 +256,7 @@
     # Insert instructions for unpacking the package and changing directories
     #
     [[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar.*"
+    [[ "$vrs" != "" ]] && [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     # Select a script execution method
     case $this_script in
@@ -325,6 +327,7 @@
         *util-linux)    wrt_unpack  "$name-$vrs.tar.*"  ;;
         *)              wrt_unpack2 "$name-$vrs.tar.*"  ;;
       esac
+      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     # Select a script execution method
@@ -385,6 +388,7 @@
       tcl)    wrt_unpack2 "$name$vrs-src.tar.*" ;;
       *)      wrt_unpack2 "$name-$vrs.tar.*"    ;;
     esac
+    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_chroot1 "${this_script}" "${file}"
     #
@@ -439,6 +443,7 @@
       tcl)    wrt_unpack3 "$name$vrs-src.tar.*" ;;
       *)      wrt_unpack3 "$name-$vrs.tar.*"    ;;
     esac
+    [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
     #
     wrt_run_as_root2 "${this_script}" "${file}"
     #
@@ -537,6 +542,7 @@
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
       wrt_unpack2 "$FILE"
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     wrt_run_as_chroot1 "${this_script}" "${file}"
@@ -639,6 +645,7 @@
     if [ "$vrs" != "" ] ; then
       FILE="$name-$vrs.tar.*"
       wrt_unpack3 "$FILE"
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
     #
     wrt_run_as_root2 "${this_script}" "${file}"

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-05-07 14:27:20 UTC (rev 2663)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-05-07 14:56:41 UTC (rev 2664)
@@ -140,9 +140,10 @@
         gcc)    FILE="gcc-core-$vrs.tar.*"  ;;
         *)      FILE="$name-$vrs.tar.*"     ;;
       esac
-     # Insert instructions for unpacking the package and to set the PKGDIR variable.
-     wrt_unpack "$FILE"
-  fi
+      # Insert instructions for unpacking the package and to set the PKGDIR variable.
+      wrt_unpack "$FILE"
+      [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags
+    fi
 
     case $this_script in
       *binutils* )  # Dump the path to sources directory for later removal
@@ -308,6 +309,7 @@
       esac
       wrt_unpack2 "$FILE"
       wrt_target_vars
+      [[ "$OPTIMIZE" != "0" ]] &&  wrt_optimize "$name" && wrt_makeflags
     fi
 
     case $this_script in




More information about the alfs-log mailing list