linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-02-03 23:07:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15882 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Ken Moffat 2015-04-27 19:32:22 +00:00
parent c22db16fa5
commit 2717491809
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
introduction/welcome/changelog.xml
View File

@ -52,6 +52,10 @@
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>
</listitem>

8
postlfs/filesystems/mdadm.xml
View File

@ -32,7 +32,7 @@
<para>The <application>mdadm</application> package contains administration
tools for software RAID.</para>
&lfs77_checked;
&lfs77_checked; &gcc5_built;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@ -88,10 +88,12 @@
<title>Installation of mdadm</title>
<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
commands:</para>

13
x/installing/xorg-server.xml
View File

@ -72,6 +72,12 @@
<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>
Optional patch:
@ -125,6 +131,13 @@
<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>
If you have downloaded the first optional patch, apply it by running
the following command:

17
x/lib/qt4.xml
View File

@ -75,6 +75,16 @@
</listitem>
</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>
<bridgehead renderas="sect4">Required</bridgehead>
@ -154,6 +164,13 @@
<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 ====== -->
<bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>