Changeset eb954a8


Ignore:
Timestamp:
03/22/2018 09:11:27 AM (4 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
3153e82
Parents:
4fe0229
Message:

Reinstate autotools build in glib2

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r4fe0229 reb954a8  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "21">                   <!-- Always 2 digits -->
     3<!ENTITY day          "22">                   <!-- Always 2 digits -->
    44<!ENTITY month        "03">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2018">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "March 21st, &year;">
     9<!ENTITY releasedate  "March 22nd, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • general/genlib/glib2.xml

    r4fe0229 reb954a8  
    99  <!ENTITY glib2-md5sum        "f2b59392f2fb514bbe7791dda0c36da5">
    1010  <!ENTITY glib2-size          "7.7 MB">
    11   <!ENTITY glib2-buildsize     "149 MB (add 1 MB for tests)">
    12   <!ENTITY glib2-time          "0.3 SBU (add 0.4 SBU for tests; both using  parallelism=4)">
     11  <!ENTITY glib2-buildsize     "193 MB (add 78 MB for tests)">
     12  <!ENTITY glib2-time          "1.3 SBU (add 4.7 SBU for tests)">
    1313]>
    1414
     
    101101<!--      <xref linkend="elfutils"/> and -->
    102102        <xref linkend="DocBook"/>,
    103         <xref linkend="docbook-xsl"/>, and
     103        <xref linkend="docbook-xsl"/>,
     104        <xref linkend="gtk-doc"/>, and
    104105        <xref linkend="libxslt"/> (to build manual pages)
    105 
    106       <!-- <xref linkend="gtk-doc"/> cound not find a reference to this
    107       in the meson build -->
    108106    </para>
    109107
     
    131129    <title>Installation of GLib</title>
    132130
    133     <para>If desired, appy the optional patch. In many cases, applications that
     131    <para>If desired, apply the optional patch. In many cases, applications that
    134132    use this library, either  directly or indirectly via other libraries such
    135133    as <xref linkend="gtk3"/>, output numerous warnings when run from the
     
    153151<screen><userinput>patch -Np1 -i ../glib-&glib2-version;-skip_warnings-1.patch</userinput></screen>
    154152
    155     <warning>
     153<!--    <warning>
    156154      <para>
    157155        If upgrading from a previous version of GLib that was built using
     
    163161        <command>-lg{io,lib,module,object,thread}</command>. 600+ files must
    164162        be modified on a complete gnome desktop.
    165 <!--        Issue the following commands as the
    166         <systemitem class="username">root</systemitem> user: -->
     163TODO: If reinstating meson, reference the instructions to remove .la files
    167164      </para>
    168 
    169 <!-- Sorry, I broke my system berore I was able to fully test these commands
    170      Feel free to test and uncomment if sane (I believe they are, but will
    171      not introduce to end-users until it is tested thoroughly). - DJ
    172 
    173 <screen>if test -f /usr/lib/libglib-2.0.la; then
    174     mkdir /usr/lib/la-file-backup &amp;&amp;
    175     for lafile in /usr/lib/libg{io,lib,module,object,thread}-2.0.la; do
    176         mv "${lafile}" /usr/lib/la-file-backup/$(basename "${lafile}").bak
    177     done &amp;&amp;
    178     for file in `find /usr/lib -name "*.la"`; do
    179         grep -q '/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la' \
    180              "${file}" &amp;&amp;
    181         sed -e 's@/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la@-lg\1@g' \
    182             -i.bak "${file}" &amp;&amp;
    183         mv -v "${file}.bak" /usr/lib/la-file-backup
    184     done
    185 fi</screen>-->
    186165    </warning>
    187 
     166-->
    188167    <para>
    189168      Install <application>GLib</application> by running the following
     
    191170    </para>
    192171
     172<!-- To be used when meson is deemed usable by upstream
    193173<screen><userinput>mkdir build-glib &amp;&amp;
    194174cd    build-glib &amp;&amp;
    195175
    196 meson --prefix=/usr      \
     176meson - -prefix=/usr      \
    197177      -Dwith-pcre=system \
    198178      -Dwith-docs=no     \
     
    200180      ..                 &amp;&amp;
    201181ninja</userinput></screen>
    202 
     182-->
     183
     184<screen><userinput>./configure --prefix=/usr      \
     185            --with-pcre=system \
     186            --with-python=/usr/bin/python3 &amp;&amp;
     187make</userinput></screen>
    203188    <para>
    204189      The <application>GLib</application> test suite requires
     
    220205    </para></note>
    221206
    222 <screen role="root"><userinput>ninja install &amp;&amp;
    223 
     207<screen role="root"><userinput>make install</userinput></screen>
     208<!-- used when built with meson/ninja
    224209chmod -v 755 /usr/bin/{gdbus-codegen,glib-gettextize} &amp;&amp;
    225210
    226211mkdir -p /usr/share/doc/glib-&glib2-version; &amp;&amp;
    227212cp -r ../docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-&glib2-version;</userinput></screen>
    228 
     213-->
    229214    <para>
    230215      You should now install <xref linkend="desktop-file-utils"/> and proceed to
     
    234219    <para>
    235220      To test the results, after having installed the package, issue:
    236       <command>ninja test</command>.  When run in a graphical environment,
     221      <command>make -k check</command>.  When run in a graphical environment,
    237222      one test, appinfo, fails if <xref linkend='gnome-terminal'/> is not
    238223      installed.
     
    245230
    246231    <para>
    247       <command>sed ... meson.build</command>: Fix the version of
    248       the package to be consistent with other version numbers embedded
    249       in the code.
    250     </para>
    251 
    252     <para>
    253       <parameter>-Dwith-pcre=system</parameter>: This switch causes the
     232      <parameter>--with-pcre=system</parameter>: This switch causes the
    254233      build to use a system-provided version of the
    255234      <application>PCRE</application> library instead of an internal
     
    258237
    259238    <para>
    260       <parameter>-Dwith-docs=no</parameter>: This switch prevents
    261       rebuilding the package documentation.
    262     </para>
     239      <parameter>--with-python=/usr/bin/python3</parameter>: Allows
     240      using Python3 instead of Python2, even if Python2 is installed.
     241    </para>
     242
     243    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     244      href="../../xincludes/gtk-doc-rebuild.xml"/>
    263245
    264246  </sect2>
     
    293275          /usr/include/glib-2.0,
    294276          /usr/lib/gio,
    295           /usr/lib/glib-2.0, and
    296           /usr/share/glib-2.0
     277          /usr/lib/glib-2.0,
     278          /usr/share/glib-2.0, and
     279          /usr/share/gtk-doc/html/{gio,glib,gobject}
    297280        </seg>
    298281      </seglistitem>
  • introduction/welcome/changelog.xml

    r4fe0229 reb954a8  
    4343-->
    4444    <listitem>
     45      <para>March 22nd, 2018</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[pierre] - Reinstate autotools build in glib-2.56.0: meson
     49           build is not ready yet.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>March 21st, 2018</para>
    4656      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.