Changeset 229ed25 for BOOK/cross-tools/mips64-64/gcc-static.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/mips64-64/gcc-static.xml (modified) (4 diffs)

BOOK/cross-tools/mips64-64/gcc-static.xml

@@ -25 +25 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../64/gcc-static.xml"
+    href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -47 +47 @@
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -79 +71 @@
   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
   --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
-  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-  --with-ppl=/cross-tools --with-cloog=/cross-tools \
-  --without-headers --with-newlib --disable-decimal-float \
-  --disable-libgomp --disable-libmudflap --disable-libssp \
-  --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
+  --with-sysroot=${CLFS} --with-local-prefix=/tools \
+  --with-native-system-header-dir=/tools/include --disable-nls \
+  --enable-shared --disable-static --enable-languages=c,c++ \
+  --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \
+  --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \
+  --with-gmp=/cross-tools --with-cloog=/cross-tools --enable-cloog-backend=isl \
+  --with-isl=/cross-tools --disable-isl-version-check --with-system-zlib \
+  --enable-checking=release --enable-libstdcxx-time --with-abi=64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -106 +100 @@
     xpointer="xpointer(//*[@os='aq'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ar'])"/>
+
   </sect2>