Changeset 2717491

Timestamp:

04/27/2015 07:32:22 PM (9 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

17468d93

Parents:

c22db16

Message:

mdadm, qt4, xorg-server: add gcc-5 fixes to the book.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15882 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/filesystems/mdadm.xml (modified) (2 diffs)
• x/installing/xorg-server.xml (modified) (2 diffs)
• x/lib/qt4.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -52 +52 @@
           a word. Fixes
           <ulink url="&blfs-ticket-root;6436">#6436</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - gcc-5 fixes for: mdadm-3.3.2, xorg-server-1.17.1,
+          qt-4.8.6.</para>
         </listitem>
       </itemizedlist>

postlfs/filesystems/mdadm.xml

@@ -33 +33 @@
     tools for software RAID.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -89 +89 @@
 
     <para>
-      First, fix a problem inroduced by <application>&gcc-490;</application>:
+      First, fix problems introduced by <application>&gcc-490;</application>
+      and <application>gcc-5</application>:
     </para>
 
-<screen><userinput>sed -i 's/Wall -Werror/Wall/' Makefile</userinput></screen>
+<screen><userinput>sed -i 's/Wall -Werror/Wall/' Makefile &amp;&amp;
+sed -i 's/\(^inline\)/static \1/' bitmap.c</userinput></screen>
 
     <para>Install <application>mdadm</application> by running the following

x/installing/xorg-server.xml

@@ -73 +73 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch (if you are using gcc-5):
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-gcc5_fixes-1.patch"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -125 +131 @@
   <sect2 role="installation">
     <title>Installation of Xorg Server</title>
+
+    <para>
+      If you are using gcc-5, apply the required patch by running
+      the following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../xorg-server-&xorg-server-version;-gcc5_fixes-1.patch</userinput></screen>
 
     <para>

x/lib/qt4.xml

@@ -76 +76 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch (if you are using gcc-5):
+          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-gcc5_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -154 +164 @@
 <screen><userinput>sed -i -e '631a if (image->isNull()) { state = Error; return -1; }' \
     src/gui/image/qgifhandler.cpp</userinput></screen>
+
+    <para>
+      If you are using gcc-5, apply the required patch by running
+      the following command:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc5_fixes-1.patch</userinput></screen>
 
 <!-- ==== Method 1 ====== -->