Make a consolidated patch for gpm

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23089 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Pierre Labastie 2020-05-10 14:22:58 +00:00
parent 4c22625cea
commit 725343afbd
2 changed files with 7 additions and 12 deletions

View File

@ -82,7 +82,7 @@
<listitem>
<para>
Required patch:
<ulink url="&patch-root;/gpm-&gpm-version;-glibc_2.26-1.patch"/>
<ulink url="&patch-root;/gpm-&gpm-version;-consolidated-1.patch"/>
</para>
</listitem>
</itemizedlist>
@ -113,22 +113,14 @@
<sect2 role="installation">
<title>Installation of GPM</title>
<para>
First, fix building with gcc-10.1 and later versions:
</para>
<screen><userinput>sed -e '/last_selection_time/s/^/extern /' \
-i src/headers/daemon.h</userinput></screen>
<para>
Install <application>GPM</application> by running
the following commands:
</para>
<screen><userinput>sed -i -e 's:&lt;gpm.h&gt;:"headers/gpm.h":' src/prog/{display-buttons,display-coords,get-versions}.c &amp;&amp;
patch -Np1 -i ../gpm-&gpm-version;-glibc_2.26-1.patch &amp;&amp;
./autogen.sh &amp;&amp;
./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
<screen><userinput>patch -Np1 -i ../gpm-&gpm-version;-consolidated-1.patch &amp;&amp;
./autogen.sh &amp;&amp;
./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
make</userinput></screen>
<para>

View File

@ -44,6 +44,9 @@
<listitem>
<para>May 10th, 2020</para>
<itemizedlist>
<listitem>
<para>[pierre] - Make a consolidated patch for gpm.</para>
</listitem>
<listitem>
<para>[pierre] - Update to gcc-10.1.0. Partially fixes
<ulink url="&blfs-ticket-root;13511">#13511</ulink>.</para>