Changeset bc2e3fa for BOOK/cross-tools/multilib

Timestamp:

Dec 7, 2006, 11:23:24 PM (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/multilib

Files:

• binutils.xml (modified) (1 diff)
• glibc-64bit.xml (modified) (2 diffs)
• glibc.xml (modified) (2 diffs)

BOOK/cross-tools/multilib/binutils.xml

@@ -63 +63 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>../binutils-&binutils-version;/configure \
-    --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} --host=${CLFS_HOST} \
-    --target=${CLFS_TARGET} --disable-nls --enable-shared \
-    --enable-64-bit-bfd --with-lib-path=${CLFS}/tools/lib</userinput></screen>
+<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
+   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
+   --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="bd">

BOOK/cross-tools/multilib/glibc-64bit.xml

@@ -67 +67 @@
     xpointer="xpointer(//*[@os='de'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <para os="n3">Tell Glibc to install its 64-bit libraries into <filename
+    <para os="n1">Tell Glibc to install its 64-bit libraries into <filename
     class="directory">/tools/lib64</filename>:</para>
 
-<screen os="n4"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
+<screen os="n2"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -90 +82 @@
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \
+    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>
 

BOOK/cross-tools/multilib/glibc.xml

@@ -69 +69 @@
     <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="../common/glibc.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -85 +77 @@
     --disable-profile --enable-add-ons \
     --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=${CLFS}/cross-tools/bin \
-    --with-headers=${CLFS}/tools/include \
+    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
     --cache-file=config.cache</userinput></screen>