Changeset 76b06f6 for BOOK/cross-tools/ppc

Timestamp:

Sep 24, 2013, 11:53:17 AM (12 years ago)

Author:

William Harrington <kb0iic@…>

Children:

2e9ccbe

Parents:

111b12a

Message:

Prepare for CLFS-2.0.0 release.

Location:

BOOK/cross-tools/ppc

Files:

• eglibc.xml (modified) (3 diffs)
• gcc-final.xml (modified) (2 diffs)
• gcc-static.xml (modified) (2 diffs)
• linux-headers.xml (modified) (2 diffs)

BOOK/cross-tools/ppc/eglibc.xml

@@ -28 +28 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/eglibc.xml"
+    xpointer="xpointer(//*[@os='p5'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/ppc/eglibc.xml"
+    xpointer="xpointer(//*[@os='p6'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
@@ -39 +55 @@
     xpointer="xpointer(//*[@os='dd'])"/>
 
-<screen os="de"><userinput>echo "libc_cv_ssp=no" &gt; config.cache</userinput></screen>
+<screen os="de"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
+libc_cv_forced_unwind=yes
+libc_cv_c_cleanup=yes
+libc_cv_ppc_machine=yes
+libc_cv_gnu89_inline=yes
+libc_cv_ssp=no
+EOF</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -81 +103 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 

BOOK/cross-tools/ppc/gcc-final.xml

@@ -24 +24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -46 +46 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ai'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -25 +25 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
+    href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -44 +44 @@
     xpointer="xpointer(//*[@os='ag'])"/>
 
-<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
+<screen os="ah"><userinput>echo -en '#undef STANDARD_INCLUDE_DIR\n#define STANDARD_INCLUDE_DIR "/tools/include/"\n\n' >> gcc/config/rs6000/sysv4.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/rs6000/sysv4.h
 echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/rs6000/sysv4.h</userinput></screen>
+
+    <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"

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

@@ -31 +31 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen os="c"><userinput>make mrproper
+<screen os="c"><userinput>install -dv /tools/include
+make mrproper
 make ARCH=powerpc headers_check
-make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</userinput></screen>
+make ARCH=powerpc INSTALL_HDR_PATH=dest headers_install
+cp -rv dest/include/* /tools/include</userinput></screen>
 
     <variablelist os="d">
@@ -51 +53 @@
 
       <varlistentry os="d3">
-        <term><parameter>make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</parameter></term>
+        <term><parameter>make ARCH=powerpc INSTALL_HDR_PATH=dest headers_install</parameter></term>
         <listitem>
-          <para>This will install the kernel headers into
-          <filename class="directory">/tools/include</filename>.</para>
+          <para>Normally the headers_install target removes the entire
+          destination directory (default
+          <filename class="directory">/usr/include</filename>) before
+          installing the headers. To prevent this, we tell the kernel to
+          install the headers to a directory inside the source dir.</para>
         </listitem>
       </varlistentry>