Changeset 1b35ce63

Timestamp:

07/31/2013 04:05:27 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

8e56210

Parents:

6255d76

Message:

add scons, update serf to 1.3.0.

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

Files:

• general.ent (modified) (5 diffs)
• general/prog/prog.xml (modified) (1 diff)
• general/prog/scons.xml (added)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netlibs/serf.xml (modified) (5 diffs)

general.ent

@@ -331 +331 @@
 <!-- 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">
@@ -380 +379 @@
 <!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">
@@ -394 +390 @@
 <!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">
@@ -401 +398 @@
 <!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">
@@ -481 +483 @@
 <!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 -->

general/prog/prog.xml

@@ -48 +48 @@
   <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"/>

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <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>

networking/netlibs/serf.xml

@@ -7 +7 @@
   <!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">
@@ -78 +78 @@
     <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>
 
@@ -100 +96 @@
     </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>
 
@@ -111 +110 @@
     </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>
 
@@ -117 +119 @@
     <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>