Changeset 5c5a010

Timestamp:

03/18/2006 12:40:33 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

582feec

Parents:

389fe2a

Message:

Fixed the cd to Gettext sources in uClibc build.
Fixed the chapter5_Makefiles code.

Location:

HLFS

Files:

• hlfs.xsl (modified) (1 diff)
• master.sh (modified) (3 diffs)

HLFS/hlfs.xsl

@@ -194 +194 @@
                 contains(string(),'distclean') or
                 contains(string(),'dummy'))"/>
+      <!-- For uClibc we need to cd to the Gettext package -->
+      <xsl:when test="contains(string(),'cd gettext-runtime/')">
+        <xsl:text>cd ../gettext-*/gettext-runtime</xsl:text>
+        <xsl:value-of select="substring-after(string(),'gettext-runtime')"/>
+        <xsl:text>&#xA;</xsl:text>
+      </xsl:when>
       <!-- Fixing toolchain test suites run -->
       <xsl:when test="string() = 'make check' or

HLFS/master.sh

@@ -101 +101 @@
   else
     TARGET="tools-linux-gnu";    LOADER="ld-linux.so.2"
-    fi
-
-  # 022-
-  # If /home/hlfs is already present in the host, we asume that the
-  # hlfs user and group are also presents in the host, and a backup
+  fi
+
+  # NOTE: We use the lfs username and groupname also in HLFS
+  # If /home/lfs is already present in the host, we asume that the
+  # lfs user and group are also presents in the host, and a backup
   # of their bash init files is made.
 (
@@ -181 +181 @@
         # Test if the stripping phase must be skipped
       *stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
-        # Select the appropriate library
-      *glibc*)    [[ ${MODEL} = "uclibc" ]] && continue ;;
-      *uclibc*)   [[ ${MODEL} = "glibc" ]]  && continue ;;
       *) ;;
     esac
@@ -195 +192 @@
     name=`echo $this_script | sed -e 's@[0-9]\{3\}-@@' -e 's@-cross@@' -e 's@-headers@@'`
 
-    # >>>>>>>>>> U G L Y <<<<<<<<<
-    # Adjust 'name' and patch a few scripts on the fly..
+    # Adjust 'name'
     case $name in
-      linux-libc) name=linux-libc-headers
-      ;;
-      uclibc) # this sucks as method to deal with gettext/libint inside uClibc
-        sed 's@^cd gettext-runtime@cd ../gettext-*/gettext-runtime@' -i chapter05/$this_script
-      ;;
-     gcc) # to compensate for the compiler test inside gcc (which fails), disable error trap
-        sed 's@^gcc -o test test.c@set +e; gcc -o test test.c@' -i chapter05/$this_script
-      ;;
+      linux-libc) name=linux-libc-headers ;;
     esac