Author: krejzi
Date: Wed Jul 31 09:05:27 2013
New Revision: 11544

Log:
add scons, update serf to 1.3.0.

Added:
   trunk/BOOK/general/prog/scons.xml   (contents, props changed)
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/prog.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/networking/netlibs/serf.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Wed Jul 31 07:59:26 2013        (r11543)
+++ trunk/BOOK/general.ent      Wed Jul 31 09:05:27 2013        (r11544)
@@ -330,7 +330,6 @@
 
 <!-- Chapter 12 -->
 <!ENTITY acpid-version                "2.0.19">
-<!ENTITY apache-ant-version           "1.9.2">
 <!ENTITY at-version                   "3.1.13">
 <!ENTITY autofs-version               "5.0.7">
 <!ENTITY bluez-version                "4.101">
@@ -379,9 +378,6 @@
 <!ENTITY gdb-version                  "7.6">
 <!ENTITY git-version                  "1.8.3.4">
 <!ENTITY guile-version                "2.0.9">
-<!ENTITY icedtea-version              "2.4.1">
-<!ENTITY openjdk-version              "1.7.0.40">
-<!ENTITY junit-version                "4.11">
 <!ENTITY librep-version               "0.92.3">
 <!ENTITY llvm-version                 "3.3">
 <!ENTITY lua-version                  "5.1.5">
@@ -393,6 +389,7 @@
 <!ENTITY python3-version              "3.3.2">
 <!ENTITY ruby-version                 "2.0.0">
 <!ENTITY ruby-patch-version           "247">
+<!ENTITY scons-version                "2.3.0">
 <!ENTITY slang-version                "2.2.4">
 <!ENTITY subversion-version           "1.8.1">
 <!ENTITY tcl-version                  "8.6.0">
@@ -401,6 +398,11 @@
 <!ENTITY vala-version                 "&vala-major-version;.1">
 <!ENTITY yasm-version                 "1.2.0">
 
+<!ENTITY apache-ant-version           "1.9.2">
+<!ENTITY icedtea-version              "2.4.1">
+<!ENTITY junit-version                "4.11">
+<!ENTITY openjdk-version              "1.7.0.40">
+
 <!ENTITY cmake-major-version          "2.8">
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python3-majorver             "3.3">
@@ -480,7 +482,7 @@
 <!ENTITY libsoup-version              "2.42.2">
 <!ENTITY libtirpc-version             "0.2.3">
 <!ENTITY neon-version                 "0.29.6">
-<!ENTITY serf-version                 "1.2.1">
+<!ENTITY serf-version                 "1.3.0">
 
 <!-- Chapter 18 -->
 <!ENTITY Links-version                "2.7">

Modified: trunk/BOOK/general/prog/prog.xml
==============================================================================
--- trunk/BOOK/general/prog/prog.xml    Wed Jul 31 07:59:26 2013        (r11543)
+++ trunk/BOOK/general/prog/prog.xml    Wed Jul 31 09:05:27 2013        (r11544)
@@ -47,6 +47,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="python3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="python-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="ruby.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="scons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="slang.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="subversion.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="svnserver.xml"/>

Added: trunk/BOOK/general/prog/scons.xml
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ trunk/BOOK/general/prog/scons.xml   Wed Jul 31 09:05:27 2013        (r11544)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY scons-download-http 
"&sourceforge-repo;/scons/scons-&scons-version;.tar.gz">
+  <!ENTITY scons-download-ftp  " ">
+  <!ENTITY scons-md5sum        "083ce5624d6adcbdaf2526623f456ca9">
+  <!ENTITY scons-size          "588 KB">
+  <!ENTITY scons-buildsize     "12 MB">
+  <!ENTITY scons-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="scons" xreflabel="SCons-&scons-version;">
+  <?dbhtml filename="scons.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>SCons-&scons-version;</title>
+
+  <indexterm zone="scons">
+    <primary sortas="a-SCons">SCons</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to SCons</title>
+
+    <para>
+      <application>SCons</application> is a tool for building software
+      (and other files) implemented in <application>Python</application>.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&scons-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&scons-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &scons-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &scons-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &scons-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &scons-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">SCons Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="python2"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/scons"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of SCons</title>
+
+    <para>
+      Install <application>SCons</application> by running the following
+      commands as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+ <screen><userinput>python setup.py install --standard-lib \
+                           --prefix=/usr \
+                           --install-data=/usr/share \
+                           --optimize=1</userinput></screen>
+
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          scons, scons-2.3.0, sconsign, sconsign-2.3.0, scons-time and
+          scons-time-2.3.0
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/lib/python&python2-majorver;/site-packages/SCons
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="scons-prog">
+        <term><command>scons</command></term>
+        <listitem>
+          <para>
+            is a software construction tool.
+          </para>
+          <indexterm zone="scons scons-prog">
+            <primary sortas="b-scons">scons</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sconsign">
+        <term><command>sconsign</command></term>
+        <listitem>
+          <para>
+            prints <application>SCons</application>
+            <filename>.sconsign</filename> file information.
+          </para>
+          <indexterm zone="scons sconsign">
+            <primary sortas="b-sconsign">sconsign</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="scons-time">
+        <term><command>scons-time</command></term>
+        <listitem>
+          <para>
+            generates and displays <application>SCons</application>
+            timing information.
+          </para>
+          <indexterm zone="scons scons-time">
+            <primary sortas="b-scons-time">scons-time</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Wed Jul 31 07:59:26 
2013        (r11543)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Wed Jul 31 09:05:27 
2013        (r11544)
@@ -47,6 +47,12 @@
       <para>July 31st, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[krejzi] - Added SCons 2.3.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - Serf 1.3.0.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - Clutter Gst 2.0.6.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/networking/netlibs/serf.xml
==============================================================================
--- trunk/BOOK/networking/netlibs/serf.xml      Wed Jul 31 07:59:26 2013        
(r11543)
+++ trunk/BOOK/networking/netlibs/serf.xml      Wed Jul 31 09:05:27 2013        
(r11544)
@@ -6,8 +6,8 @@
 
   <!ENTITY serf-download-http 
"https://serf.googlecode.com/files/serf-&serf-version;.tar.bz2";>
   <!ENTITY serf-download-ftp  " ">
-  <!ENTITY serf-md5sum        "4f8e76c9c6567aee1d66aba49f76a58b">
-  <!ENTITY serf-size          "188 KB">
+  <!ENTITY serf-md5sum        "bb0dbf9494495db7e8b34eac99b2dc3a">
+  <!ENTITY serf-size          "133 KB">
   <!ENTITY serf-buildsize     "3.0 MB">
   <!ENTITY serf-time          "0.1 SBU">
 ]>
@@ -77,13 +77,9 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="apr-util"/> and
-      <xref linkend="openssl"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="mitkrb"/>
+      <xref linkend="apr-util"/>,
+      <xref linkend="openssl"/> and
+      <xref linkend="scons"/>
     </para>
 
     <para condition="html" role="usernotes">
@@ -99,25 +95,35 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
+<screen><userinput>sed -i 
"/incdir/s:MAJOR':&amp;\n\nenv\['SHLIBVERSION'\]='0.\${MAJOR}.0':" SConstruct 
&amp;&amp;
+sed -i "/Append/s:RPATH=libdir,::" SConstruct &amp;&amp;
+sed -i "/Default/s:lib_static,::" SConstruct &amp;&amp;
+sed -i "/Alias/s:install_static,::" SConstruct &amp;&amp;
+scons</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>.
+      To test the results, issue: <command>scons check</command>.
     </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>scons PREFIX=/usr install &amp;&amp;
+ln -sfv libserf-1.so.0.1.0 /usr/lib/libserf-1.so.0 &amp;&amp;
+ln -sfv libserf-1.so.0.1.0 /usr/lib/libserf-1.so</userinput></screen>
+
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-      href="../../xincludes/static-libraries.xml"/>
+    <para>
+      <command>sed -i "..."</command>: First sed modifies the build script
+      to build shared versioned library, second sed removes runtime path
+      from shared library and third and fourth sed disable building and
+      installing of the static library.
+    </para>    
 
   </sect2>
 
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to