Changeset 229ed25 for BOOK/temp-system/multilib/gcc.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/temp-system/multilib/gcc.xml (modified) (4 diffs)

BOOK/temp-system/multilib/gcc.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../cross-tools/multilib/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -48 +48 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='fix2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -74 +74 @@
   ../gcc-&gcc-version;/configure --prefix=/tools \
   --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-  --target=${CLFS_TARGET} --with-local-prefix=/tools  --enable-long-long \
-  --enable-c99 --enable-shared --enable-threads=posix \
-  --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
-  --disable-libstdcxx-pch</userinput></screen>
+  --target=${CLFS_TARGET} --libexecdir=/tools/lib64 --with-local-prefix=/tools \
+  --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
+  --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
+  --disable-libstdcxx-pch --enable-cloog-backend=isl --with-gmp=/tools \
+  --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
+  --disable-isl-version-check --with-cloog=/tools --with-system-zlib \
+  --with-native-system-header-dir=/tools/include --disable-libssp \
+  --disable-install-libiberty  --enable-libstdcxx-time \
+  --enable-checking=release</userinput></screen>
 
     <variablelist os="dd">
@@ -97 +102 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ts1'])"/>
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ts2'])"/>
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"