Author: ken
Date: 2012-06-05 13:36:06 -0600 (Tue, 05 Jun 2012)
New Revision: 10268
Modified:
trunk/BOOK/general/genlib/glib2.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Remove special measures from glib2 so that it again depends on pkgconfig.
Modified: trunk/BOOK/general/genlib/glib2.xml
===================================================================
--- trunk/BOOK/general/genlib/glib2.xml 2012-06-05 13:17:01 UTC (rev 10267)
+++ trunk/BOOK/general/genlib/glib2.xml 2012-06-05 19:36:06 UTC (rev 10268)
@@ -76,7 +76,8 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="libffi"/> and
+ <xref linkend="libffi"/>,
+ <xref linkend="pkgconfig"/> and
<xref linkend="python2"/>
</para>
@@ -125,9 +126,8 @@
commands:
</para>
-<screen><userinput>PCRE_LIBS=-lpcre PCRE_CFLAGS=" " \
-LIBFFI_LIBS=-lffi LIBFFI_CFLAGS=" " \
-./configure --prefix=/usr --sysconfdir=/etc --with-pcre=system &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
+ --with-pcre=system &&
make</userinput></screen>
<para>
@@ -160,13 +160,13 @@
<sect2 role="commands">
<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
<application>pkg-config</application> during the build process.
These environment variables work around not having
<application>pkg-config</application> available.
- </para>
+ </para>-->
<para>
<command>ln -v -sfn ... glibconfig.h</command>: Place a link to an
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-06-05 13:17:01 UTC
(rev 10267)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-06-05 19:36:06 UTC
(rev 10268)
@@ -47,6 +47,10 @@
<listitem>
<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>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page