Changeset 9349479

Timestamp:

12/16/2005 04:42:49 PM (19 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

e90c0c3

Parents:

e9dba98

Message:

No need to retain TCL's directory anymore, and a few typo fixes.

File:

• jhalfs (modified) (6 diffs)

jhalfs

@@ -323 +323 @@
       GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
-      # There is some entities that aren't valid package entities.
+      # There are some entities that aren't valid packages.
       if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
 
@@ -421 +421 @@
     i=`basename $file`
 
-    # If no testsuites will be run, then TCL, Expect and DejaGNU isn't needed
+    # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
     if [ "$TOOLCHAINTEST" = "0" ]; then
       if [[ `_IS_ $i tcl` ]] || [[ `_IS_ $i expect` ]] || [[ `_IS_ $i dejagnu` ]] ; then
@@ -480 +480 @@
     fi
 
-    # Dump the path to the Binutils or TCL sources directory.
-    if [[ `_IS_ $i binutils` ]] || [[ `_IS_ $i tcl` ]] ; then
+    # Dump the path to the Binutils sources directory.
+    if [[ `_IS_ $i binutils` ]] ; then
 (
     cat << EOF
@@ -494 +494 @@
         @echo "PKGDIR=\$(LFS)\$(SRC)/binutils-build" > envars && \\
         echo "export PKGDIR" >> envars
-EOF
-) >> $MKFILE.tmp
-
-    # For the Expect build we need to set the TCLPATH envar.
-    elif [[ `_IS_ $i expect` ]] ; then
-(
-    cat << EOF
-        echo "TCLPATH=\`cat sources-dir\`" >> envars && \\
-        echo "export TCLPATH" >> envars
 EOF
 ) >> $MKFILE.tmp
@@ -526 +517 @@
 
     # Remove the build directory(ies) except if the package build fails
-    # (to can review config.cache, config.log, and like.)
-    # For Binutils and TCL the sources must be retained some time.
+    # (so we can review config.cache, config.log, etc.)
+    # For Binutils the sources must be retained for some time.
     if [ "$vrs" != "" ] ; then
-      if [[ ! `_IS_ $i binutils` ]] && [[ ! `_IS_ $i tcl` ]] ; then
+      if [[ ! `_IS_ $i binutils` ]] ; then
 (
     cat << EOF
@@ -548 +539 @@
         @rm -r \`cat sources-dir\` && \\
         rm -r \$(LFS)\$(SRC)/binutils-build && \\
-        rm sources-dir
-EOF
-) >> $MKFILE.tmp
-    fi
-
-    # Remove the TCL sources after a successful Expect build.
-    if [[ `_IS_ $i expect` ]] ; then
-(
-    cat << EOF
-        @rm -r \`cat sources-dir\` && \\
         rm sources-dir
 EOF