Changeset b2881615 for general

Timestamp:

10/30/2014 10:34:17 AM (10 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

b48b05a

Parents:

bb522c6

Message:

Merge updates from trunk.

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

Location:

general

Files:

• genlib/liblinear.xml (modified) (3 diffs)
• prog/ruby.xml (modified) (2 diffs)

general/genlib/liblinear.xml

@@ -7 +7 @@
   <!ENTITY liblinear-download-http "http://www.csie.ntu.edu.tw/~cjlin/liblinear/oldfiles/liblinear-&liblinear-version;.tar.gz">
   <!ENTITY liblinear-download-ftp  " ">
-  <!ENTITY liblinear-md5sum        "f52e1f2dd6bccb58977a334bba0bbf90">
-  <!ENTITY liblinear-size          "328 KB">
+  <!ENTITY liblinear-md5sum        "a10486cf0a6064911d6d88faf29ca1c6">
+  <!ENTITY liblinear-size          "332 KB">
   <!ENTITY liblinear-buildsize     "1.1 MB">
-  <!ENTITY liblinear-time          "0.1 SBU">
+  <!ENTITY liblinear-time          "less than 0.1 SBU">
 ]>
 
@@ -40 +40 @@
 
     &lfs76_checked;
+
+    <note>
+      <para>
+        After updating this package, you need to reinstall
+        <xref linkend="nmap"/>, in order to link to the new library.
+      </para>
+    </note>
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -97 +104 @@
 
 <screen role="root"><userinput>install -vm644 linear.h /usr/include &amp;&amp;
-install -vm755 liblinear.so.1 /usr/lib &amp;&amp;
-ln -sfv liblinear.so.1 /usr/lib/liblinear.so</userinput></screen>
+install -vm755 liblinear.so.2 /usr/lib &amp;&amp;
+ln -sfv liblinear.so.2 /usr/lib/liblinear.so</userinput></screen>
   </sect2>
 

general/prog/ruby.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-&ruby-version;.tar.bz2">
+  <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/2.1/ruby-&ruby-version;.tar.xz">
   <!ENTITY ruby-download-ftp  " ">
 <!--
   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.1/ruby-&ruby-version;-p&ruby-patch-version;.tar.bz2">
 -->
-  <!ENTITY ruby-md5sum        "02b7da3bb06037c777ca52e1194efccb">
-  <!ENTITY ruby-size          "12 MB">
-  <!ENTITY ruby-buildsize     "477 MB">
-  <!ENTITY ruby-time          "2.8 SBU (additional 0.2 SBU for tests)">
+  <!ENTITY ruby-md5sum        "99aa2b01240d91edaecc2fc9d8254e44">
+  <!ENTITY ruby-size          "9 MB">
+  <!ENTITY ruby-buildsize     "337 MB (additional 550 MB for rdoc indexes and API documents)">
+  <!ENTITY ruby-time          "2 SBU (additional 1.1 SBU for rdoc indexes and API documents 0.2 SBU for tests)">
 ]>
 
@@ -123 +123 @@
       <parameter>--enable-shared</parameter>: This switch enables building of
       the <filename class="libraryfile">libruby</filename> shared library.
+    </para>
+
+    <para>
+      <option>--disable-install-doc</option>: This switch disables building and
+      installing rdoc indexes and C API documents.
+    </para>
+
+    <para>
+      <option>--disable-install-rdoc</option>: This switch disables building
+      and installing rdoc indexes.
+    </para>
+
+    <para>
+      <option>--disable-install-capi</option>: This switch disables building
+      and installing C API documents.
     </para>