Changeset eb954a8

Timestamp:

03/22/2018 09:11:27 AM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

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:

• general.ent (modified) (2 diffs)
• general/genlib/glib2.xml (modified) (12 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "03">                   <!-- Always 2 digits -->
 <!ENTITY year         "2018">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 21st, &year;">
+<!ENTITY releasedate  "March 22nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

general/genlib/glib2.xml

@@ -9 +9 @@
   <!ENTITY glib2-md5sum        "f2b59392f2fb514bbe7791dda0c36da5">
   <!ENTITY glib2-size          "7.7 MB">
-  <!ENTITY glib2-buildsize     "149 MB (add 1 MB for tests)">
-  <!ENTITY glib2-time          "0.3 SBU (add 0.4 SBU for tests; both using  parallelism=4)">
+  <!ENTITY glib2-buildsize     "193 MB (add 78 MB for tests)">
+  <!ENTITY glib2-time          "1.3 SBU (add 4.7 SBU for tests)">
 ]>
 
@@ -101 +101 @@
 <!--      <xref linkend="elfutils"/> and -->
         <xref linkend="DocBook"/>,
-        <xref linkend="docbook-xsl"/>, and
+        <xref linkend="docbook-xsl"/>,
+        <xref linkend="gtk-doc"/>, and
         <xref linkend="libxslt"/> (to build manual pages)
-
-      <!-- <xref linkend="gtk-doc"/> cound not find a reference to this 
-      in the meson build -->
     </para>
 
@@ -131 +129 @@
     <title>Installation of GLib</title>
 
-    <para>If desired, appy the optional patch. In many cases, applications that
+    <para>If desired, apply the optional patch. In many cases, applications that
     use this library, either  directly or indirectly via other libraries such
     as <xref linkend="gtk3"/>, output numerous warnings when run from the
@@ -153 +151 @@
 <screen><userinput>patch -Np1 -i ../glib-&glib2-version;-skip_warnings-1.patch</userinput></screen>
 
-    <warning>
+<!--    <warning>
       <para>
         If upgrading from a previous version of GLib that was built using
@@ -163 +161 @@
         <command>-lg{io,lib,module,object,thread}</command>. 600+ files must
         be modified on a complete gnome desktop.
-<!--        Issue the following commands as the
-        <systemitem class="username">root</systemitem> user: -->
+TODO: If reinstating meson, reference the instructions to remove .la files
       </para>
-
-<!-- Sorry, I broke my system berore I was able to fully test these commands
-     Feel free to test and uncomment if sane (I believe they are, but will
-     not introduce to end-users until it is tested thoroughly). - DJ
-
-<screen>if test -f /usr/lib/libglib-2.0.la; then
-    mkdir /usr/lib/la-file-backup &amp;&amp;
-    for lafile in /usr/lib/libg{io,lib,module,object,thread}-2.0.la; do
-        mv "${lafile}" /usr/lib/la-file-backup/$(basename "${lafile}").bak
-    done &amp;&amp;
-    for file in `find /usr/lib -name "*.la"`; do
-        grep -q '/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la' \
-             "${file}" &amp;&amp;
-        sed -e 's@/usr/lib/libg\(io\|module\|lib\|object\|thread\)-2.0.la@-lg\1@g' \
-            -i.bak "${file}" &amp;&amp;
-        mv -v "${file}.bak" /usr/lib/la-file-backup
-    done
-fi</screen>-->
     </warning>
-
+-->
     <para>
       Install <application>GLib</application> by running the following
@@ -191 +170 @@
     </para>
 
+<!-- To be used when meson is deemed usable by upstream
 <screen><userinput>mkdir build-glib &amp;&amp;
 cd    build-glib &amp;&amp;
 
-meson --prefix=/usr      \
+meson - -prefix=/usr      \
       -Dwith-pcre=system \
       -Dwith-docs=no     \
@@ -200 +180 @@
       ..                 &amp;&amp;
 ninja</userinput></screen>
-
+-->
+
+<screen><userinput>./configure --prefix=/usr      \
+            --with-pcre=system \
+            --with-python=/usr/bin/python3 &amp;&amp;
+make</userinput></screen>
     <para>
       The <application>GLib</application> test suite requires
@@ -220 +205 @@
     </para></note>
 
-<screen role="root"><userinput>ninja install &amp;&amp;
-
+<screen role="root"><userinput>make install</userinput></screen>
+<!-- used when built with meson/ninja
 chmod -v 755 /usr/bin/{gdbus-codegen,glib-gettextize} &amp;&amp;
 
 mkdir -p /usr/share/doc/glib-&glib2-version; &amp;&amp;
 cp -r ../docs/reference/{NEWS,gio,glib,gobject} /usr/share/doc/glib-&glib2-version;</userinput></screen>
-
+-->
     <para>
       You should now install <xref linkend="desktop-file-utils"/> and proceed to
@@ -234 +219 @@
     <para>
       To test the results, after having installed the package, issue:
-      <command>ninja test</command>.  When run in a graphical environment, 
+      <command>make -k check</command>.  When run in a graphical environment, 
       one test, appinfo, fails if <xref linkend='gnome-terminal'/> is not 
       installed.
@@ -245 +230 @@
 
     <para>
-      <command>sed ... meson.build</command>: Fix the version of
-      the package to be consistent with other version numbers embedded
-      in the code.
-    </para>
-
-    <para>
-      <parameter>-Dwith-pcre=system</parameter>: This switch causes the
+      <parameter>--with-pcre=system</parameter>: This switch causes the
       build to use a system-provided version of the
       <application>PCRE</application> library instead of an internal
@@ -258 +237 @@
 
     <para>
-      <parameter>-Dwith-docs=no</parameter>: This switch prevents
-      rebuilding the package documentation.
-    </para>
+      <parameter>--with-python=/usr/bin/python3</parameter>: Allows
+      using Python3 instead of Python2, even if Python2 is installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -293 +275 @@
           /usr/include/glib-2.0,
           /usr/lib/gio, 
-          /usr/lib/glib-2.0, and 
-          /usr/share/glib-2.0
+          /usr/lib/glib-2.0,
+          /usr/share/glib-2.0, and 
+          /usr/share/gtk-doc/html/{gio,glib,gobject}
         </seg>
       </seglistitem>

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>March 22nd, 2018</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Reinstate autotools build in glib-2.56.0: meson
+           build is not ready yet.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 21st, 2018</para>
       <itemizedlist>