Changeset 9214104


Ignore:
Timestamp:
05/16/2020 06:23:41 PM (4 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:
e32a0bb
Parents:
e4b4cda
Message:

Last fixes for GCC 10:

  • patch boost to help libreoffice
  • patch libreoffice
  • fix multiple def in rox-filer
  • fix implicit type cas in vsftpd (sed by thomas)

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    re4b4cda r9214104  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "15">                   <!-- Always 2 digits -->
     3<!ENTITY day          "16">                   <!-- Always 2 digits -->
    44<!ENTITY month        "05">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2020">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "May 15th, &year;">
     9<!ENTITY releasedate  "May 16th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • general/genlib/boost.xml

    re4b4cda r9214104  
    7373    </itemizedlist>
    7474
     75    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     76    <itemizedlist spacing="compact">
     77      <listitem>
     78        <para>
     79          Recommended patch, required to build <xref linkend="libreoffice"/>:
     80          <ulink url="&patch-root;/boost-&boost-version;-gcc_10-1.patch"/>
     81        </para>
     82      </listitem>
     83    </itemizedlist>
     84
    7585    <bridgehead renderas="sect3">Boost Dependencies</bridgehead>
    7686
    … …  
    93103  <sect2 role="installation">
    94104    <title>Installation of Boost</title>
    95 <!--
    96     <para>
    97       First, fix a bug with the header files path, when Python3 is used:
    98     </para>
    99 
    100 <screen><userinput>sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VERSION}m} ;@' \
    101     -i bootstrap.sh</userinput></screen>
    102 -->
     105
     106    <para>
     107      First, apply a patch wwhich allows to build libreoffice with GCC 10
     108      and later:
     109    </para>
     110
     111<screen><userinput>patch -Np1 -i ../boost-&boost-version;-gcc_10-1.patch</userinput></screen>
     112
    103113    <para>
    104114      This package can be built with several jobs running in parallel. In

  • introduction/welcome/changelog.xml

    re4b4cda r9214104  
    4343    -->
    4444    <listitem>
     45      <para>May 16th, 2020</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[pierre] - Patch libreoffice to build with GCC 10.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[pierre] - Patch boost to allow building libreoffice with
     52          GCC 10.</para>
     53        </listitem>
     54        <listitem>
     55          <para>[pierre] - Fix rox-filer for GCC 10.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[pierre] - Fix vsftpd for GCC 10. Thanks to Thomas
     59          Trepl for the sed.</para>
     60        </listitem>
     61      </itemizedlist>
     62    </listitem>
     63
     64    <listitem>
    4565      <para>May 15th, 2020</para>
    4666      <itemizedlist>

  • server/major/vsftpd.xml

    re4b4cda r9214104  
    109109useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
    110110useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
     111
     112    <para>
     113      Gcc-10 and later flags an error for an implicit type cast. Make it
     114      explicit:
     115    </para>
     116
     117<screen><userinput>sed -e "s/kVSFSysStrOpenUnknown;/(enum EVSFSysUtilOpenMode)&amp;/" -i sysstr.c</userinput></screen>
    111118
    112119    <para>

  • xsoft/office/libreoffice.xml

    re4b4cda r9214104  
    168168
    169169<!-- keep one commented patch, it's sure to again need one or more in a few months:
    170 For libreoffice 6.2.0.4, almost blfs 8.4: no patch needed, only a sed below
    171       <listitem>
    172         <para>
    173           Required patch to fix building with system <xref linkend="poppler"/> (all
    174           recent versions) and <xref linkend="boost"/>:
    175           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch"/>
    176         </para>
    177       </listitem>
    178170-->
     171      <listitem>
     172        <para>
     173          Required patch to fix building with GCC 10 and later:
     174          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-format_overflow-1.patch"/>
     175        </para>
     176      </listitem>
    179177
    180178    </itemizedlist>
    … …  
    324322cd libreoffice-&libreoffice-dlversion;</userinput></screen>
    325323
    326 <!-- keep a commented instruction if no patches are currently required
    327     <para>
    328      Fix build failures introduced by recent versions of <xref linkend="poppler"/>
    329      and <xref linkend="boost"/>:
    330     </para>
    331 
    332 <screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
    333 -->
     324<!-- keep a commented instruction if no patches are currently required -->
     325    <para>
     326     Fix build failures introduced by GCC 10 and later:
     327    </para>
     328
     329<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-format_overflow-1.patch</userinput></screen>
    334330
    335331    <para>

  • xsoft/other/rox-filer.xml

    re4b4cda r9214104  
    115115<screen><userinput>cd ROX-Filer                                                        &amp;&amp;
    116116sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &amp;&amp;
     117sed -i 's/gboolean/extern &amp;/' src/session.h                     &amp;&amp;
    117118
    118119mkdir build                        &amp;&amp;
    … …  
    160161
    161162    <para>
     163      <command>sed -i 's/gboolean/extern &amp;/' src/session.h</command>:
     164      This command fixes a multiple definition flagged as an error
     165      by GCC 10 and higher.
     166    </para>
     167
     168    <para>
    162169      <command>ln -sv application-...</command>: These commands duplicate the
    163170      icons for some common mime types. Without these links
Note: See TracChangeset for help on using the changeset viewer.