Changeset bc2e3fa for BOOK/cross-tools/alpha

Timestamp:

Dec 8, 2006, 7:23:24 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1e184e11

Parents:

8473983

Message:

Reverting of Sysroot Changes

Location:

BOOK/cross-tools/alpha

Files:

• gcc-static.xml (modified) (1 diff)
• glibc-headers.xml (modified) (5 diffs)
• glibc.xml (modified) (1 diff)
• linux-headers.xml (modified) (1 diff)

BOOK/cross-tools/alpha/gcc-static.xml

@@ -76 +76 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${CLFS_HOST} --target=${CLFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \

BOOK/cross-tools/alpha/glibc-headers.xml

@@ -49 +49 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
@@ -63 +55 @@
    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    --disable-sanity-checks --enable-kernel=2.6.0 \
-   --with-headers=${CLFS}/tools/include --cache-file=config.cache \
-   --with-binutils=${CLFS}/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
+   --with-headers=/tools/include --cache-file=config.cache \
+   --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
 
     <note os="e1">
@@ -122 +114 @@
         
        <varlistentry os="ca7">
-           <term><parameter>--with-headers=${CLFS}/tools/include</parameter></term>
+           <term><parameter>--with-headers=/tools/include</parameter></term>
            <listitem>
               <para>This tells Glibc to compile itself against the headers
-              recently installed to the <filename class="directory">${CLFS}/tools</filename>
+              recently installed to the <filename class="directory">/tools</filename>
               directory, so that it knows exactly what features the kernel has
               and can optimize itself accordingly.</para>
@@ -132 +124 @@
         
        <varlistentry os="ca8">
-           <term><parameter>--with-binutils=${CLFS}/cross-tools/${CLFS_TARGET}/bin</parameter></term>
+           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
            <listitem>
               <para>This tells Glibc to use the Binutils for our specific target architecture.</para>
@@ -148 +140 @@
 
    <para os="cf">First we will copy a common file over to <filename 
-   class="directory">${CLFS}/tools/include</filename>:</para>
+   class="directory">/tools/include</filename>:</para>
 
-<screen os="cg"><userinput>install -dv ${CLFS}/tools/include/bits
-cp -v bits/stdio_lim.h ${CLFS}/tools/include/bits</userinput></screen>
+<screen os="cg"><userinput>install -dv /tools/include/bits
+cp -v bits/stdio_lim.h /tools/include/bits</userinput></screen>
 
    <para os="ch">Now we will create a blank stub file:</para>
 
-<screen os="ci"><userinput>touch ${CLFS}/tools/include/gnu/stubs.h</userinput></screen>
+<screen os="ci"><userinput>touch /tools/include/gnu/stubs.h</userinput></screen>
 
    <para os="cj">Another header is needed for NPTL:</para>
    
-<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
-    ${CLFS}/tools/include/bits/</userinput></screen>
+<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
 
   </sect2>

BOOK/cross-tools/alpha/glibc.xml

@@ -76 +76 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>

BOOK/cross-tools/alpha/linux-headers.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>install -dv ${CLFS}/tools/include
-cp -av include/asm-alpha ${CLFS}/tools/include/asm
-cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
+<screen><userinput>install -dv /tools/include
+cp -av include/asm-alpha /tools/include/asm
+cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
 
   </sect2>