r2902 - jhalfs/branches/experimental/CLFS2

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Aug 8 10:06:36 PDT 2006


Author: georgeb
Date: 2006-08-08 11:06:35 -0600 (Tue, 08 Aug 2006)
New Revision: 2902

Modified:
   jhalfs/branches/experimental/CLFS2/master.sh
Log:
CFLS2 fixes:  groff and file are optional in the cross-tools phase. No need to build if recent version on the host

Modified: jhalfs/branches/experimental/CLFS2/master.sh
===================================================================
--- jhalfs/branches/experimental/CLFS2/master.sh	2006-08-07 21:18:21 UTC (rev 2901)
+++ jhalfs/branches/experimental/CLFS2/master.sh	2006-08-08 17:06:35 UTC (rev 2902)
@@ -129,7 +129,6 @@
 }
 
 
-
 #-----------------------------#
 cross_tools_Makefiles() {     #
 #-----------------------------#
@@ -140,11 +139,21 @@
     this_script=`basename $file`
     #
     # Skip this script...
+    # NOTE.. the book indicated you only needed to install groff or file if the host
+    #   had older versions. The packages would be installed in the target directory
+    #   and not the host.
     case $this_script in
       *cflags* | *variables* )  # work done in host_prep_Makefiles
-         continue; ;;
+        ;;
+      *file ) FileVer=`file --version | head -n1 | cut -d " " -f1`
+              [[ "$FileVer" = "file-4.17" ]] && continue
+        ;;
+      *groff) GroffVer=`groff --version | head -n1 | cut -d " " -f4`
+              [[ "$GroffVer" = "1.19.2" ]] && continue
+        ;;
       *) ;;
     esac
+    
     #
     # Set the dependency for the first target.
     if [ -z $PREV ] ; then PREV=028-creating-sysfile ; fi




More information about the alfs-log mailing list