Changeset b22e1383

Timestamp:

06/05/2012 07:36:06 PM (12 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f7e3016

Parents:

19d81f7

Message:

Remove special measures from glib2 so that it again depends on pkgconfig.

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

Files:

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

general/genlib/glib2.xml

@@ -77 +77 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libffi"/> and
+      <xref linkend="libffi"/>,
+      <xref linkend="pkgconfig"/> and
       <xref linkend="python2"/>
     </para> 
@@ -126 +127 @@
     </para>
 
-<screen><userinput>PCRE_LIBS=-lpcre PCRE_CFLAGS=" " \
-LIBFFI_LIBS=-lffi LIBFFI_CFLAGS=" " \
-./configure --prefix=/usr --sysconfdir=/etc --with-pcre=system &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+ --with-pcre=system &amp;&amp;
 make</userinput></screen>
 
@@ -161 +161 @@
     <title>Command Explanations</title>
 
-    <para>
+<!--<para>
       PCRE_* and LIBFFI_*: <application>Glib</application> is a prerequsite
       for <application>pkg-config</application>, but it wants to use
@@ -167 +167 @@
       These environment variables work around not having
       <application>pkg-config</application> available.
-    </para>
+    </para>-->
 
     <para>

introduction/welcome/changelog.xml

@@ -48 +48 @@
           <para>[abenton] - Updated Libre Office to 3.5.4.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - Removed "special measures" from glib2 so that it again
+          depends on pkg-config.</para>
+        </listitem>
       </itemizedlist>
     </listitem>