Changeset 229ed25 for BOOK/cross-tools/common/binutils.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/cross-tools/common/binutils.xml (modified) (5 diffs)

BOOK/cross-tools/common/binutils.xml

@@ -28 +28 @@
     enable.</para>
 
+<!-- Branch update patch area
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+-->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/common/binutils.xml"
@@ -40 +49 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
+<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \
   --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
-  --enable-64-bit-bfd --disable-multilib</userinput></screen>
+  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
+  --disable-static --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
+      <title>The meaning of the new configure options:</title>
 
       <varlistentry os="bd1">
-        <term><parameter>--prefix=/cross-tools</parameter></term>
+        <term><parameter>AR=ar AS=as</parameter></term>
         <listitem>
-          <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">/cross-tools</filename>
-          directory.</para>
+          <para>This prevents Binutils from compiling with ${CLFS_HOST}-ar
+           and ${CLFS_HOST}-as as they are provided by this package and therefore
+           not installed yet.</para>
         </listitem>
       </varlistentry>
@@ -93 +102 @@
 
       <varlistentry os="bd6">
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Enable the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd7">
         <term><parameter>--disable-multilib</parameter></term>
         <listitem>
@@ -107 +109 @@
       </varlistentry>
 
-      <varlistentry os="bd8">
+      <varlistentry os="bd7">
         <term><parameter>--enable-64-bit-bfd</parameter></term>
         <listitem>
@@ -141 +143 @@
     <filename class="directory">/tools/include</filename> directory:</para>
 
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
+<screen os="bk"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /tools/include</userinput></screen>
 
   </sect2>