Changeset a9fe0ce for final-system

Timestamp:

Apr 17, 2006, 6:37:55 PM (19 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

c52100b1

Parents:

8e639af

Message:

Removed the util-linux and kernel sun disklabel patches and replaced it with a gcc patch that fixes the issue

Location:

final-system

Files:

• 64/gcc.xml (modified) (1 diff)
• common/gcc.xml (modified) (1 diff)
• common/util-linux.xml (modified) (1 diff)
• mips/gcc.xml (modified) (1 diff)
• mips64-64/gcc.xml (modified) (1 diff)
• mips64/gcc.xml (modified) (1 diff)
• mips64/util-linux.xml (modified) (1 diff)
• multilib/gcc.xml (modified) (1 diff)
• multilib/util-linux.xml (modified) (1 diff)

final-system/64/gcc.xml

@@ -22 +22 @@
     <title>Installation of GCC</title>
 
-    <para os="p1">Apply the following patch to so that linking to /lib64 is now set
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="p3">Apply the following patch to so that linking to /lib64 is now set
     to /lib.</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/common/gcc.xml

@@ -34 +34 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <para os="p1">The following patch fixes an issue where gcc doesn't generate
+    some code properly.</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&gcc-fold_const-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the

final-system/common/util-linux.xml

@@ -60 +60 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
-
-    <para os="p5">Util-linux does not compute the checksum of a sun disklabel
-    properly with gcc-&gcc-version;. The following patch fixes this issue:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-gcc41_sun_disklabel_fixes-patch;</userinput></screen>
 
     <para os="a">Prepare Util-linux for compilation:</para>

final-system/mips/gcc.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/mips64-64/gcc.xml

@@ -23 +23 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/gcc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/mips64/gcc.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/mips64/util-linux.xml

@@ -42 +42 @@
     xpointer="xpointer(//*[@os='p4'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <para os="p7">Util-linux has a compilation error when built using 64bit
+    <para os="p5">Util-linux has a compilation error when built using 64bit
     and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen os="p8"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/gcc.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/util-linux.xml

@@ -44 +44 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>