Changeset 13e0a61 for general/genlib

Timestamp:

06/01/2013 08:03:58 AM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

af73a280

Parents:

dcdde93

Message:

Merge trunk and systemd branch

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11231 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

general/genlib

Files:

• expat.xml (modified) (3 diffs)
• json-c.xml (modified) (1 diff)
• libglade.xml (modified) (5 diffs)
• lzo.xml (modified) (5 diffs)

general/genlib/expat.xml

@@ -78 +78 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -111 +111 @@
       <seglistitem>
         <seg>xmlwf</seg>
-        <seg>libexpat.{so,a}</seg>
+        <seg>libexpat.so</seg>
         <seg>/usr/share/doc/expat-&expat-version;</seg>
       </seglistitem>
@@ -133 +133 @@
 
       <varlistentry id="libexpat">
-        <term><filename class='libraryfile'>libexpat.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libexpat.so</filename></term>
         <listitem>
           <para>contains API functions for parsing XML.</para>
           <indexterm zone="expat libexpat">
-            <primary sortas="c-libexpat">libexpat.{so,a}</primary>
+            <primary sortas="c-libexpat">libexpat.so</primary>
           </indexterm>
         </listitem>

general/genlib/json-c.xml

@@ -80 +80 @@
   <sect2 role="installation">
     <title>Installation of JSON-C</title>
+
+    <note>
+      <para>
+        This package does not support parallel build.
+      </para>
+    </note>
 
     <para>

general/genlib/libglade.xml

@@ -80 +80 @@
 
 <screen><userinput>sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -95 +95 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
     <para><command>sed -i '/DG_DISABLE_DEPRECATED/d'</command>: Some of the
     <application>glib</application> functions that
@@ -103 +100 @@
     glib-2.30. This sed removes the G_DISABLE_DEPRECATED CFLAG.</para>
 
-    <para><option>--disable-static</option>: prevent static libraries
-    being built and installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
 
   </sect2>
@@ -118 +118 @@
       <seglistitem>
         <seg>libglade-convert (requires <command>python</command>)</seg>
-        <seg>libglade-2.0.{so,a}</seg>
+        <seg>libglade-2.0.so</seg>
         <seg>/usr/{include/libglade-2.0/glade,share/{gtk-doc/html/libglade,
         xml/libglade}}</seg>
@@ -141 +141 @@
 
       <varlistentry id="libglade-lib">
-        <term><filename class='libraryfile'>libglade-2.0.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libglade-2.0.so</filename></term>
         <listitem>
           <para>contain the functions necessary to load Glade interface
           files.</para>
           <indexterm zone="libglade libglade-lib">
-            <primary sortas="c-libglade-2.0">libglade-2.0.{so,a}</primary>
+            <primary sortas="c-libglade-2.0">libglade-2.0.so</primary>
           </indexterm>
         </listitem>

general/genlib/lzo.xml

@@ -87 +87 @@
 <screen><userinput>./configure --prefix=/usr                    \
             --enable-shared                  \
+            --disable-static                 \
             --docdir=/usr/share/doc/lzo-&LZO-version; &amp;&amp;
 make</userinput></screen>
@@ -104 +105 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -117 +126 @@
         </seg>
         <seg>
-          liblzo2.{so,a}
+          liblzo2.so
         </seg>
         <seg>
@@ -132 +141 @@
 
       <varlistentry id="liblzo2">
-        <term><filename class='libraryfile'>liblzo2.{so,a}</filename></term>
+        <term><filename class='libraryfile'>liblzo2.so</filename></term>
         <listitem>
           <para>
@@ -138 +147 @@
           </para>
           <indexterm zone="LZO liblzo2">
-            <primary sortas="c-liblzo2">liblzo2.{so,a}</primary>
+            <primary sortas="c-liblzo2">liblzo2.so</primary>
           </indexterm>
         </listitem>